From 416a4da4d78b72903d031579ad4164ccbb8814d4 Mon Sep 17 00:00:00 2001 From: darode Date: Mon, 4 Apr 2011 10:42:57 +0000 Subject: [PATCH] 2011-04-04 Dario Rodriguez * pandora_agent_installer: Modified agent isntaller to deal with specified user installation. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4163 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/unix/ChangeLog | 5 +++++ pandora_agents/unix/pandora_agent_installer | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog index 99aea0c3ab..e33cbc63f6 100644 --- a/pandora_agents/unix/ChangeLog +++ b/pandora_agents/unix/ChangeLog @@ -1,3 +1,8 @@ +2011-04-04 Dario Rodriguez + + * pandora_agent_installer: Modified agent isntaller to deal with + specified user installation. + 2011-04-04 Dario Rodriguez * plugins/pandora_update: Modified plugin for agent autoupdate. diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 1172ad7802..2b20e8e327 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -294,11 +294,11 @@ install () { chmod 755 $PANDORA_BASE$PANDORA_EXEC_BIN if [ "$OS_NAME" = "FreeBSD" ] then - chown root:wheel $PANDORA_BASE$PANDORA_BIN - chown root:wheel $PANDORA_BASE$PANDORA_EXEC_BIN + chown $PANDORA_USER:wheel $PANDORA_BASE$PANDORA_BIN + chown $PANDORA_USER:wheel $PANDORA_BASE$PANDORA_EXEC_BIN else - chown root:root $PANDORA_BASE$PANDORA_BIN - chown root:root $PANDORA_BASE$PANDORA_EXEC_BIN + chown $PANDORA_USER:root $PANDORA_BASE$PANDORA_BIN + chown $PANDORA_USER:root $PANDORA_BASE$PANDORA_EXEC_BIN fi echo "Copying Pandora FMS Agent configuration file to $PANDORA_BASE$PANDORA_CFG/pandora_agent.conf..." @@ -339,7 +339,7 @@ install () { chmod -R 770 $PANDORA_BASE$PANDORA_TEMP chmod 775 $PANDORA_BASE$PANDORA_TEMP else - chown root:root $PANDORA_BASE$PANDORA_LOG_DIR/$PANDORA_LOG + chown $PANDORA_USER:root $PANDORA_BASE$PANDORA_LOG_DIR/$PANDORA_LOG fi echo "Copying default agent configuration to $PANDORA_BASE$PANDORA_CFG/pandora_agent.conf"