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

2010-12-27 Ramon Novoa <rnovoa@artica.es> 

* pandora_agent_installer, DEBIAN/postinst, DEBIAN/prerm,
	  DEBIAN/make_deb_package.sh, pandora_agent.spec,
	  pandora_agent, SunOS/make_solaris_package/prototype,
	  SunOS/make_solaris_package/make_solaris_package.sh,
	  pandora_agent_exec: Renamed pandora_exec to
	  pandora_agent_exec to avoid conflicts with the pandora_exec
	  script installed by the server.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3708 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2010-12-27 10:18:20 +00:00
parent 39e330e7de
commit 7426589233
10 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_agents/unix/ChangeLog
View File

@ -1,3 +1,13 @@
2010-12-27 Ramon Novoa <rnovoa@artica.es>
* pandora_agent_installer, DEBIAN/postinst, DEBIAN/prerm,
DEBIAN/make_deb_package.sh, pandora_agent.spec,
pandora_agent, SunOS/make_solaris_package/prototype,
SunOS/make_solaris_package/make_solaris_package.sh,
pandora_agent_exec: Renamed pandora_exec to
pandora_agent_exec to avoid conflicts with the pandora_exec
script installed by the server.
2010-12-16 Ramon Novoa <rnovoa@artica.es>
* pandora_agent_installer, pandora_agent_daemon: Additional

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -59,7 +59,7 @@ do
done
cp -aRf tentacle_client temp_package/usr/bin/
cp -aRf pandora_agent temp_package/usr/bin/
cp -aRf pandora_exec temp_package/usr/bin/pandora_exec.agent
cp -aRf pandora_agent_exec temp_package/usr/bin/pandora_agent_exec
cp -aRf pandora_agent_daemon temp_package/etc/init.d/pandora_agent_daemon
cp Linux/pandora_agent.conf temp_package/etc/pandora/

3
pandora_agents/unix/DEBIAN/postinst
View File

@ -13,9 +13,6 @@ echo "Copy new version of plugins into dir"
cp -i /tmp/plugins/* /usr/share/pandora_agent/plugins/
rm /tmp/plugins -rf
echo "Linking pandora_exec..."
ln -s /usr/bin/pandora_exec.agent /usr/bin/pandora_exec 2> /dev/null
echo "Linking Pandora FMS Agent plugins directory to $PANDORA_CFG/plugins..."
rm $PANDORA_CFG/plugins 2> /dev/null
ln -s $PANDORA_HOME/plugins $PANDORA_CFG 2> /dev/null

6
pandora_agents/unix/DEBIAN/prerm
View File

@ -9,9 +9,3 @@ PANDORA_CFG=/etc/pandora
#rm -rf $PANDORA_CFG/pandora_agent.conf
update-rc.d -f pandora_agent_daemon remove
rm /usr/bin/pandora_exec
if [ -e /usr/bin/pandora_exec.server ]
then
ln -s /usr/bin/pandora_exec.server /usr/bin/pandora_exec 2> /dev/null
fi

2
pandora_agents/unix/SunOS/make_solaris_package/make_solaris_package.sh
View File

@ -42,7 +42,7 @@ mkdir -p /tmp/pandora/usr/share/pandora_agent/plugins
cp ../../pandora_agent /tmp/pandora/usr/bin
cp ../../tentacle_client /tmp/pandora/usr/bin
cp ../../pandora_agent_daemon /tmp/pandora/etc/init.d
cp ../../pandora_exec /tmp/pandora/usr/bin
cp ../../pandora_agent_exec /tmp/pandora/usr/bin
# copy plugin files
cp ../../plugins/* /tmp/pandora/usr/share/pandora_agent/plugins

2
pandora_agents/unix/SunOS/make_solaris_package/prototype
View File

@ -2,7 +2,7 @@ i pkginfo
i copyright
f none usr/bin/pandora_agent 0755 root root
f none usr/bin/tentacle_client 0755 root root
f none usr/bin/pandora_exec 0755 root root
f none usr/bin/pandora_agent_exec 0755 root root
d none usr/share/pandora_agent 0755 root root
d none usr/share/pandora_agent/plugins 0755 root root
f none usr/share/pandora_agent/plugins/files_indir 0755 root root

2
pandora_agents/unix/pandora_agent
View File

@ -147,7 +147,7 @@ my %Conf = (
'secondary_server_opts' => '',
'autotime' => 0,
'timezone_offset' => 0,
'pandora_exec' => 'pandora_exec',
'pandora_exec' => 'pandora_agent_exec',
'agent_threads' => 1,
'udp_server_port' => 41122,
'udp_server_auth_address' => '0.0.0.0',

4
pandora_agents/unix/pandora_agent.spec
View File

@ -44,7 +44,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/
cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_agent/
cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_client $RPM_BUILD_ROOT/usr/bin/
cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent $RPM_BUILD_ROOT/usr/bin/
cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_exec $RPM_BUILD_ROOT/usr/bin/
cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_exec $RPM_BUILD_ROOT/usr/bin/
cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/init.d/pandora_agent_daemon
cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/init.d/pandora_agent_daemon
cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/pandora_agent.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/
@ -116,7 +116,7 @@ exit 0
%files
%defattr(750,pandora,root)
/usr/bin/pandora_agent
/usr/bin/pandora_exec
/usr/bin/pandora_agent_exec
%defattr(770,pandora,root)
/var/log/pandora/

4
pandora_agents/unix/pandora_exec → pandora_agents/unix/pandora_agent_exec
View File

@ -1,12 +1,12 @@
#!/usr/bin/perl
##########################################################################
# pandora_exec
# pandora_agent_exec
#
# Executes the given command and prints its output to stdout. If the
# execution times out or the command does not exist nothing is printed
# to stdout. This is part of Pandora FMS Plugin server, do not delete!.
#
# Usage: pandora_exec <timeout in seconds> <command>
# Usage: pandora_agent_exec <timeout in seconds> <command>
##########################################################################
# Copyright (c) 2008-2010 Ramon Novoa, rnovoa@gmail.com
# (c) 2008-2010 Artica Soluciones Tecnologicas S.L

8
pandora_agents/unix/pandora_agent_installer
View File

@ -17,7 +17,7 @@ FORCE=0
LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
PANDORA_HOME=/usr/share/pandora_agent
PANDORA_BIN=/usr/bin/pandora_agent
PANDORA_EXEC_BIN=/usr/bin/pandora_exec
PANDORA_EXEC_BIN=/usr/bin/pandora_agent_exec
PANDORA_TEMP=/var/spool/pandora
PANDORA_CFG=/etc/pandora
PANDORA_LOG_DIR=/var/log/pandora
@ -85,7 +85,7 @@ uninstall () {
then
PANDORA_HOME=/usr/local/share/pandora_agent
PANDORA_BIN=/usr/local/bin/pandora_agent
PANDORA_EXEC_BIN=/usr/local/bin/pandora_exec
PANDORA_EXEC_BIN=/usr/local/bin/pandora_agent_exec
PANDORA_CFG=/usr/local/etc/pandora
TENTACLE=/usr/local/bin/tentacle_client
PANDORA_MAN=/usr/local/man
@ -158,7 +158,7 @@ install () {
then
PANDORA_HOME=/usr/local/share/pandora_agent
PANDORA_BIN=/usr/local/bin/pandora_agent
PANDORA_EXEC_BIN=/usr/local/bin/pandora_exec
PANDORA_EXEC_BIN=/usr/local/bin/pandora_agent_exec
PANDORA_CFG=/usr/local/etc/pandora
TENTACLE=/usr/local/bin/tentacle_client
PANDORA_MAN=/usr/local/man
@ -290,7 +290,7 @@ install () {
echo "Copying Pandora FMS Agent to $PANDORA_BASE$PANDORA_BIN..."
cp pandora_agent $PANDORA_BASE$PANDORA_BIN
chmod 755 $PANDORA_BASE$PANDORA_BIN
cp pandora_exec $PANDORA_BASE$PANDORA_EXEC_BIN
cp pandora_agent_exec $PANDORA_BASE$PANDORA_EXEC_BIN
chmod 755 $PANDORA_BASE$PANDORA_EXEC_BIN
if [ "$OS_NAME" = "FreeBSD" ]
then