From 693dc909377168ee75592049e5b0fa345f55e048 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Fri, 5 Jun 2015 13:44:47 +0200 Subject: [PATCH] Add tiquet #23 from issues git --- pandora_agents/unix/pandora_agent.redhat.spec | 8 +++++--- pandora_agents/unix/pandora_agent.spec | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 0f83aeb314..0da98ffacf 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -51,10 +51,12 @@ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_R cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/pandora_agent.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_client.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ +# comment this line because fixed update/re-install, lost configuration of agent +# https://github.com/pandorafms/pandorafms/pull/23. Thanks Robert Nelson # Checking old config file (if exists) -if [ -f /etc/pandora/pandora_agent.conf ] ; then - mv /etc/pandora/pandora_agent.conf /etc/pandora/pandora_agent.conf.backup -fi +#if [ -f /etc/pandora/pandora_agent.conf ] ; then +# mv /etc/pandora/pandora_agent.conf /etc/pandora/pandora_agent.conf.backup +#fi cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/Linux/pandora_agent.conf $RPM_BUILD_ROOT/usr/share/pandora_agent/pandora_agent.conf.rpmnew diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 865b044d47..189cfaf697 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -51,10 +51,12 @@ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_R cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/pandora_agent.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_client.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ +# comment this line because fixed update/re-install, lost configuration of agent +# https://github.com/pandorafms/pandorafms/pull/23. Thanks Robert Nelson # Checking old config file (if exists) -if [ -f /etc/pandora/pandora_agent.conf ] ; then - mv /etc/pandora/pandora_agent.conf /etc/pandora/pandora_agent.conf.backup -fi +#if [ -f /etc/pandora/pandora_agent.conf ] ; then +# mv /etc/pandora/pandora_agent.conf /etc/pandora/pandora_agent.conf.backup +#fi cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/Linux/pandora_agent.conf $RPM_BUILD_ROOT/usr/share/pandora_agent/pandora_agent.conf.rpmnew