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

2013-08-22 Dario Rodriguez <dario@artica.es> 

* pandora_agent_installer: Merged improvements from 4.1 branch
        to fix several bugs related to custom installation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8688 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2013-08-22 17:04:00 +00:00
parent d58f3f9d9b
commit bd5d827ba9
2 changed files with 28 additions and 1 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 @@
2013-08-22 Dario Rodriguez <dario@artica.es>
* pandora_agent_installer: Merged improvements from 4.1 branch
to fix several bugs related to custom installation.
2013-07-10 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Changed the regexp used to retrieve ip addresses to

24
pandora_agents/unix/pandora_agent_installer
View File

@ -241,6 +241,9 @@ install () {
# Alter dynamically the daemon launcher and setup the new path
# if PANDORA_BASE is customized.
AGENT_CFG=$OS_NAME/pandora_agent.conf
AGENT_CFG_TEMP=$OS_NAME/pandora_agent.conf.temp
if [ ! -z "$PANDORA_BASE" ]
then
if [ "$OS_NAME" = "FreeBSD" ]
@ -339,7 +342,6 @@ install () {
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
fi
# Create logfile
@ -450,6 +452,26 @@ install () {
chmod -R 770 $PANDORA_BASE$PANDORA_TEMP
chmod 775 $PANDORA_BASE$PANDORA_TEMP
fi
#chown each directory one by one to avoid erros when no pandora_base and pandora_use is given
chown -R $PANDORA_USER $PANDORA_BASE/var/log
chown -R $PANDORA_USER $PANDORA_BASE/$PANDORA_MAN/man1
if [ "$OS_NAME" = "FreeBSD" ]
then
chown -R $PANDORA_USER $PANDORA_BASE/usr/local/bin
else
chown -R $PANDORA_USER $PANDORA_BASE/usr/bin
fi
chown -R $PANDORA_USER $PANDORA_BASE$PANDORA_HOME
chown -R $PANDORA_USER $PANDORA_BASE/tmp
chown -R $PANDORA_USER $PANDORA_BASE$PANDORA_TEMP/data_out
chown -R $PANDORA_USER $PANDORA_BASE$PANDORA_CFG
chown -R $PANDORA_USER $PANDORA_BASE$PANDORA_LOG_DIR
chown -R $PANDORA_USER $PANDORA_BASE$PANDORA_HOME/collections
chown -R $PANDORA_USER $PANDORA_BASE$PANDORA_HOME/plugins
echo "Copying default agent configuration to $PANDORA_BASE$PANDORA_CFG/pandora_agent.conf"