From 40277d7b7fe528f83e54c227e0205e408b0da736 Mon Sep 17 00:00:00 2001 From: slerena Date: Tue, 27 Oct 2009 21:04:49 +0000 Subject: [PATCH] 2009-10-26 Sancho Lerena * Updated conf files: temporal variable to use /tmp by default. Updated spec revision. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2057 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/ChangeLog | 6 ++++++ pandora_agents/linux/pandora_agent.conf | 5 ++--- pandora_agents/linux/pandora_agent.spec | 6 ++---- pandora_agents/unix/AIX/pandora_agent.conf | 4 ++-- pandora_agents/unix/HPUX/pandora_agent.conf | 4 ++-- pandora_agents/unix/Linux/pandora_agent.conf | 2 +- pandora_agents/unix/SunOS/pandora_agent.conf | 4 ++-- pandora_agents/unix/pandora_agent.spec | 4 +--- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog index e3929ac80e..ecc6f01bca 100644 --- a/pandora_agents/ChangeLog +++ b/pandora_agents/ChangeLog @@ -1,3 +1,9 @@ +2009-10-26 Sancho Lerena + + * Updated conf files: temporal variable to use /tmp by default. + + Updated spec revision. + 2009-10-17 Sancho Lerena * linux/pandora_agent_daemon: Fixed problems in small term with diff --git a/pandora_agents/linux/pandora_agent.conf b/pandora_agents/linux/pandora_agent.conf index 13974cf5e5..ddb11ac9eb 100755 --- a/pandora_agents/linux/pandora_agent.conf +++ b/pandora_agents/linux/pandora_agent.conf @@ -9,7 +9,7 @@ server_ip localhost server_path /var/spool/pandora/data_in -temporal /var/spool/pandora/data_out +temporal /tmp logfile /var/log/pandora/pandora_agent.log # Interval in seconds, 300 by default @@ -23,7 +23,7 @@ debug 0 #agent_name adama # Agent description -#description Demo agent +#description Put here your agent description # Group assigned for this agent (descriptive, p.e: Servers) #group Servers @@ -161,5 +161,4 @@ module_end module_plugin grep_log /var/log/syslog Syslog ssh # Plugin for inventory on the agent (Only Enterprise) - # module_plugin inventory 1 cpu ram video nic hd cdrom software diff --git a/pandora_agents/linux/pandora_agent.spec b/pandora_agents/linux/pandora_agent.spec index d92ac69b5a..f9fef01525 100755 --- a/pandora_agents/linux/pandora_agent.spec +++ b/pandora_agents/linux/pandora_agent.spec @@ -6,7 +6,7 @@ Summary: Pandora FMS Linux agent Name: %{name} Version: %{version} -Release: 1 +Release: 2 License: GPL Vendor: ArticaST Source0: %{name}-%{version}.tar.gz @@ -38,7 +38,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/bin/ mkdir -p $RPM_BUILD_ROOT/usr/sbin/ mkdir -p $RPM_BUILD_ROOT/etc/pandora/ mkdir -p $RPM_BUILD_ROOT/etc/init.d/ -mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/data_out mkdir -p $RPM_BUILD_ROOT/var/log/pandora/ cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_agent/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_client $RPM_BUILD_ROOT/usr/bin/ @@ -81,7 +80,7 @@ else fi if [ -f /etc/pandora/pandora_agent.conf ] ; then - rm -Rf /etc/pandora/pandora_agent.conf + mv /etc/pandora/pandora_agent.conf /etc/pandora/pandora_agent.conf_backup fi if [ ! -e /etc/pandora/plugins ]; then @@ -110,7 +109,6 @@ exit 0 %defattr(770,pandora,root) /var/log/pandora/ -/var/spool/pandora/data_out %defattr(755,pandora,root) /usr/bin/tentacle_client diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf index f189ec6dd1..b4404ee5c5 100755 --- a/pandora_agents/unix/AIX/pandora_agent.conf +++ b/pandora_agents/unix/AIX/pandora_agent.conf @@ -8,8 +8,8 @@ # ================== server_ip localhost -server_path /var/spool/pandora/data_in -temporal /var/spool/pandora/data_out +server_path /var/spool/pandora/data_in +temporal /tmp logfile /var/log/pandora/pandora_agent.log # Interval in seconds, 300 by default diff --git a/pandora_agents/unix/HPUX/pandora_agent.conf b/pandora_agents/unix/HPUX/pandora_agent.conf index 7d96bc24e1..7490874624 100755 --- a/pandora_agents/unix/HPUX/pandora_agent.conf +++ b/pandora_agents/unix/HPUX/pandora_agent.conf @@ -8,8 +8,8 @@ # ================== server_ip farscape.artica.es -server_path /var/spool/pandora/data_in -temporal /var/spool/pandora/data_out +server_path /var/spool/pandora/data_in +temporal /tmp logfile /var/log/pandora/pandora_agent.log # Interval in seconds, 300 by default diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf index 13974cf5e5..233fa5d4d2 100755 --- a/pandora_agents/unix/Linux/pandora_agent.conf +++ b/pandora_agents/unix/Linux/pandora_agent.conf @@ -9,7 +9,7 @@ server_ip localhost server_path /var/spool/pandora/data_in -temporal /var/spool/pandora/data_out +temporal /tmp logfile /var/log/pandora/pandora_agent.log # Interval in seconds, 300 by default diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf index 7d96bc24e1..7490874624 100755 --- a/pandora_agents/unix/SunOS/pandora_agent.conf +++ b/pandora_agents/unix/SunOS/pandora_agent.conf @@ -8,8 +8,8 @@ # ================== server_ip farscape.artica.es -server_path /var/spool/pandora/data_in -temporal /var/spool/pandora/data_out +server_path /var/spool/pandora/data_in +temporal /tmp logfile /var/log/pandora/pandora_agent.log # Interval in seconds, 300 by default diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 815772d360..4a3a8cb3f1 100755 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -6,7 +6,7 @@ Summary: Pandora FMS Linux agent, PERL version Name: %{name} Version: %{version} -Release: 1 +Release: 2 License: GPL Vendor: ArticaST Source0: %{name}-%{version}.tar.gz @@ -39,7 +39,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/bin/ mkdir -p $RPM_BUILD_ROOT/usr/sbin/ mkdir -p $RPM_BUILD_ROOT/etc/pandora/ mkdir -p $RPM_BUILD_ROOT/etc/init.d/ -mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/data_out mkdir -p $RPM_BUILD_ROOT/var/log/pandora/ cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_agent/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_client $RPM_BUILD_ROOT/usr/bin/ @@ -103,7 +102,6 @@ exit 0 %defattr(770,pandora,root) /var/log/pandora/ -/var/spool/pandora/data_out %defattr(755,pandora,root) /usr/bin/tentacle_client