tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-03-28 Ramon Novoa <rnovoa@artica.es> 

* pandora_agent_installer: Moved the code that sets PANDORA_USER to
	  the right place.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5848 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2012-03-28 17:39:07 +00:00
parent 10aba27d29
commit 23be21f92f
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_agents/unix/ChangeLog
View File

@ -1,3 +1,8 @@
2012-03-28 Ramon Novoa <rnovoa@artica.es>
* pandora_agent_installer: Moved the code that sets PANDORA_USER to
the right place.
2012-03-02 Koichiro Kikuchi <koichiro@rworks.jp> 2012-03-02 Koichiro Kikuchi <koichiro@rworks.jp>
* pandora_agent: Fixed bug of my previous commit (removed "qw"). * pandora_agent: Fixed bug of my previous commit (removed "qw").

22
pandora_agents/unix/pandora_agent_installer
View File

@ -188,6 +188,17 @@ install () {
echo "Checking Pandora FMS Agent on $PANDORA_BASE$PANDORA_BIN...." echo "Checking Pandora FMS Agent on $PANDORA_BASE$PANDORA_BIN...."
fi fi
# Set the user the agent will run as
if [ "$PANDORA_USER" != "" ]
then
sed -e "s/.*pandora_user .*/pandora_user $PANDORA_USER/" $AGENT_CFG > $AGENT_CFG_TEMP 2> /dev/null && \
mv $AGENT_CFG_TEMP $AGENT_CFG
chmod 755 pandora_agent_daemon
chown -R $PANDORA_USER $PANDORA_BASE
else
PANDORA_USER="root"
fi
# Alter dynamically the daemon launcher and setup the new path # Alter dynamically the daemon launcher and setup the new path
# if PANDORA_BASE is customized. # if PANDORA_BASE is customized.
@ -270,17 +281,6 @@ install () {
mkdir -p $PANDORA_BASE$PANDORA_CFG 2> /dev/null mkdir -p $PANDORA_BASE$PANDORA_CFG 2> /dev/null
mkdir -p $PANDORA_BASE$PANDORA_LOG_DIR 2> /dev/null mkdir -p $PANDORA_BASE$PANDORA_LOG_DIR 2> /dev/null
# Set the user the agent will run as
if [ "$PANDORA_USER" != "" ]
then
sed -e "s/.*pandora_user .*/pandora_user $PANDORA_USER/" $AGENT_CFG > $AGENT_CFG_TEMP 2> /dev/null && \
mv $AGENT_CFG_TEMP $AGENT_CFG
chmod 755 pandora_agent_daemon
chown -R $PANDORA_USER $PANDORA_BASE
else
PANDORA_USER="root"
fi
# Create logfile # Create logfile
if [ ! -z "`touch $PANDORA_BASE$PANDORA_LOG_DIR/$PANDORA_LOG`" ] if [ ! -z "`touch $PANDORA_BASE$PANDORA_LOG_DIR/$PANDORA_LOG`" ]
then then