From 5f962a0ce1b2332007dfc4964af97e4d3621ec61 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 1 Jun 2010 13:11:02 +0000 Subject: [PATCH] 2010-06-01 Miguel de Dios * unix/DEBIAN/prerm: disabled the erase conf file and plugin dir. * unix/DEBIAN/conffiles: added plugin directory. * unix/DEBIAN/make_deb_package.sh: cleaned source code, and now make the plugin empty dir for package builder. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2830 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/ChangeLog | 9 ++++ pandora_agents/unix/DEBIAN/conffiles | 1 + .../unix/DEBIAN/make_deb_package.sh | 46 +------------------ pandora_agents/unix/DEBIAN/prerm | 4 +- 4 files changed, 13 insertions(+), 47 deletions(-) diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog index 35a27b6861..88687d5418 100644 --- a/pandora_agents/ChangeLog +++ b/pandora_agents/ChangeLog @@ -1,3 +1,12 @@ +2010-06-01 Miguel de Dios + + * unix/DEBIAN/prerm: disabled the erase conf file and plugin dir. + + * unix/DEBIAN/conffiles: added plugin directory. + + * unix/DEBIAN/make_deb_package.sh: cleaned source code, and now make the + plugin empty dir for package builder. + 2010-05-20 Ramon Novoa * unix/DEBIAN/control, unix/DEBIAN/make_deb_package.sh: Renamed diff --git a/pandora_agents/unix/DEBIAN/conffiles b/pandora_agents/unix/DEBIAN/conffiles index 0a0587e3db..dae6551ac7 100755 --- a/pandora_agents/unix/DEBIAN/conffiles +++ b/pandora_agents/unix/DEBIAN/conffiles @@ -1 +1,2 @@ /etc/pandora/pandora_agent.conf +/etc/pandora/plugins diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index c6fcd4c5ac..36b04570b9 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -29,18 +29,12 @@ fi cd .. echo "Make a \"temp_package\" temp dir for job." -#~ mkdir -p temp_package/usr/share/pandora_agent -#~ mkdir -p temp_package/var/spool/pandora/data_out -#~ mkdir -p temp_package/var/log/pandora/ -#~ mkdir -p temp_package/etc/pandora -#~ mkdir -p temp_package/etc/init.d/ -#~ mkdir -p temp_package/usr/bin mkdir -p temp_package/usr mkdir -p temp_package/usr/share/pandora_agent/ mkdir -p temp_package/usr/bin/ mkdir -p temp_package/usr/sbin/ -mkdir -p temp_package/etc/pandora/ +mkdir -p temp_package/etc/pandora/plugins mkdir -p temp_package/etc/init.d/ mkdir -p temp_package/var/log/pandora/ @@ -54,44 +48,6 @@ cp -aRf pandora_agent temp_package/usr/bin/ cp -aRf pandora_agent_daemon temp_package/etc/init.d/pandora_agent_daemon cp Linux/pandora_agent.conf temp_package/etc/pandora/ - -#~ PANDORA_LOG=temp_package/var/log/pandora/pandora_agent.log -#~ PANDORA_BIN=temp_package/usr/bin/pandora_agent -#~ PANDORA_HOME=temp_package/usr/share/pandora_agent -#~ TENTACLE=temp_package/usr/bin/tentacle_client -#~ PANDORA_CFG=temp_package/etc/pandora -#~ PANDORA_STARTUP=temp_package/etc/init.d/pandora_agent_daemon - -# Create logfile -#~ if [ ! -z "`touch $PANDORA_LOG`" ] -#~ then - #~ echo "Seems to be a problem generating logfile ($PANDORA_LOG) please check it"; - #~ exit -#~ else - #~ echo "Creating logfile at $PANDORA_LOG..." -#~ fi - -#~ # Copying agent -#~ echo "Copying Pandora FMS Agent to $PANDORA_BIN..." -#~ cp pandora_agent $PANDORA_BIN -#~ -#~ echo "Copying Pandora FMS Agent contrib dir to $PANDORA_HOME/..." -#~ cp pandora_agent_daemon $PANDORA_HOME -#~ -#~ echo "Copying default agent configuration to $PANDORA_HOME/pandora_agent.conf" -#~ cp pandora_agent.conf $PANDORA_HOME/pandora_agent.conf -#~ -#~ echo "Copying Pandora FMS Agent plugins to $PANDORA_HOME/plugins..." -#~ cp -r plugins $PANDORA_HOME -#~ -#~ echo "Copying tentacle client to $TENTACLE" -#~ cp tentacle_client $TENTACLE -#~ -#~ echo "Linking start-up daemon script at $PANDORA_STARTUP"; -#~ cp pandora_agent_daemon $PANDORA_STARTUP -#~ -#~ touch $PANDORA_CFG/pandora_agent.conf - echo "Remove the SVN files and other temp files." for item in `find temp_package` do diff --git a/pandora_agents/unix/DEBIAN/prerm b/pandora_agents/unix/DEBIAN/prerm index 1c800d2e65..0079ff264a 100755 --- a/pandora_agents/unix/DEBIAN/prerm +++ b/pandora_agents/unix/DEBIAN/prerm @@ -5,8 +5,8 @@ echo Stop Pandora agent daemon PANDORA_CFG=/etc/pandora -rm -rf $PANDORA_CFG/plugins -rm -rf $PANDORA_CFG/pandora_agent.conf +#rm -rf $PANDORA_CFG/plugins +#rm -rf $PANDORA_CFG/pandora_agent.conf update-rc.d -f pandora_agent_daemon remove