Add tiquet #23 from issues git

This commit is contained in:
m-lopez-f 2015-06-05 13:44:47 +02:00
parent 7f210d82f1
commit 693dc90937
2 changed files with 10 additions and 6 deletions

View File

@ -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

View File

@ -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