tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

2014-08-14 Koichiro Kikuchi <koichiro@rworks.jp>

Browse Source 
* pandora_agent_installer: Fixed symlink source path.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10420 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
koichirok 2014-08-14 04:28:27 +00:00
parent 8d94e15eb5
commit 0eecbd3edd
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_agents/unix/ChangeLog
View File

@ -1,3 +1,7 @@
2014-08-14 Koichiro Kikuchi <koichiro@rworks.jp>
* pandora_agent_installer: Fixed symlink source path.
2014-08-13 Koichiro Kikuchi <koichiro@rworks.jp> 2014-08-13 Koichiro Kikuchi <koichiro@rworks.jp>
* FreeBSD/pandora_agent: Small fixes: use proper rc variables, * FreeBSD/pandora_agent: Small fixes: use proper rc variables,

13
pandora_agents/unix/pandora_agent_installer
View File

@ -375,15 +375,15 @@ install () {
done done
chmod -R 700 $PANDORA_BASE$PANDORA_HOME/plugins chmod -R 700 $PANDORA_BASE$PANDORA_HOME/plugins
DESTDIR="" PANDORA_BASE_REAL="$PANDORA_BASE"
[ "$PANDORA_BASE" ] && [ $FAKEROOT -eq 1 ] && DESTDIR=$PANDORA_BASE [ $FAKEROOT -eq 1 ] && PANDORA_BASE_REAL=""
ln -s $DESTDIR$PANDORA_HOME/plugins $PANDORA_BASE$PANDORA_CFG ln -s $PANDORA_BASE_REAL$PANDORA_HOME/plugins $PANDORA_BASE$PANDORA_CFG
echo "Copying Pandora FMS Agent collections to $PANDORA_BASE$PANDORA_HOME/collections..." echo "Copying Pandora FMS Agent collections to $PANDORA_BASE$PANDORA_HOME/collections..."
cp -r collections $PANDORA_BASE$PANDORA_HOME cp -r collections $PANDORA_BASE$PANDORA_HOME
chmod -R 700 $PANDORA_BASE$PANDORA_HOME/collections chmod -R 700 $PANDORA_BASE$PANDORA_HOME/collections
ln -s $DESTDIR$PANDORA_HOME/collections $PANDORA_BASE$PANDORA_CFG ln -s $PANDORA_BASE_REAL$PANDORA_HOME/collections $PANDORA_BASE$PANDORA_CFG
if [ $WITHOUT_TENTACLE_SERVER -eq 0 ] if [ $WITHOUT_TENTACLE_SERVER -eq 0 ]
then then
@ -428,6 +428,9 @@ install () {
echo "Start Pandora FMS service with 'launchctl start com.pandorafms.pandorafms'" echo "Start Pandora FMS service with 'launchctl start com.pandorafms.pandorafms'"
echo "This service has been scheduled to launch on each system startup" echo "This service has been scheduled to launch on each system startup"
else else
DESTDIR=""
[ "$PANDORA_BASE" ] && [ $FAKEROOT -eq 1 ] && DESTDIR=$PANDORA_BASE
cp $DAEMON_SCRIPT $DESTDIR$PANDORA_STARTUP cp $DAEMON_SCRIPT $DESTDIR$PANDORA_STARTUP
chmod 755 $DESTDIR$PANDORA_STARTUP chmod 755 $DESTDIR$PANDORA_STARTUP
chown root:0 $DESTDIR$PANDORA_STARTUP 2>/dev/null chown root:0 $DESTDIR$PANDORA_STARTUP 2>/dev/null
@ -473,7 +476,7 @@ install () {
echo " ($HOME/.ssh/id_dsa) under /home/pandora/.ssh/authorized_keys " echo " ($HOME/.ssh/id_dsa) under /home/pandora/.ssh/authorized_keys "
echo "on your Pandora FMS Server host" echo "on your Pandora FMS Server host"
echo " " echo " "
echo "You also need to setup your $DESTDIR$PANDORA_CFG/pandora_agent.conf config file" echo "You also need to setup your $PANDORA_BASE$PANDORA_CFG/pandora_agent.conf config file"
echo " " echo " "
if [ "$OS_NAME" = "FreeBSD" ] if [ "$OS_NAME" = "FreeBSD" ]
then then