From 00badd671a517394afd5e289046a2b05e0908f2b Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 19 Sep 2018 18:39:19 +0200 Subject: [PATCH] Removed .empty from tarball and rpm --- pandora_agents/unix/collections/.empty | 1 - pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 4 ++-- pandora_agents/win32/bin/collections/.empty | 0 5 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 pandora_agents/unix/collections/.empty delete mode 100644 pandora_agents/win32/bin/collections/.empty diff --git a/pandora_agents/unix/collections/.empty b/pandora_agents/unix/collections/.empty deleted file mode 100644 index 8d1c8b69c3..0000000000 --- a/pandora_agents/unix/collections/.empty +++ /dev/null @@ -1 +0,0 @@ - diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 57317deecf..a8348b9632 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -95,7 +95,7 @@ if [ ! -e /etc/pandora/plugins ]; then fi if [ ! -e /etc/pandora/collections ]; then - ln -s /usr/share/pandora_agent/collections /etc/pandora + mkdir -p /etc/pandora/collections fi mkdir -p /var/spool/pandora/data_out diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 04574d3e25..f2a5d5757d 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -88,7 +88,7 @@ if [ ! -e /etc/pandora/plugins ]; then fi if [ ! -e /etc/pandora/collections ]; then - ln -s /usr/share/pandora_agent/collections /etc/pandora + mkdir /etc/pandora/collections fi cp -aRf /usr/share/pandora_agent/pandora_agent_logrotate /etc/logrotate.d/pandora_agent diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 5cb84bc1fb..504eaecbf8 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -388,8 +388,8 @@ install () { ln -s $PANDORA_BASE_REAL$PANDORA_HOME/plugins $PANDORA_BASE$PANDORA_CFG - echo "Copying Pandora FMS Agent collections to $PANDORA_BASE$PANDORA_HOME/collections..." - cp -r collections $PANDORA_BASE$PANDORA_HOME + echo "Creating the collections directory in to $PANDORA_BASE$PANDORA_HOME/collections..." + mkdir -p $PANDORA_BASE$PANDORA_HOME/collections chmod -R 700 $PANDORA_BASE$PANDORA_HOME/collections ln -s $PANDORA_BASE_REAL$PANDORA_HOME/collections $PANDORA_BASE$PANDORA_CFG diff --git a/pandora_agents/win32/bin/collections/.empty b/pandora_agents/win32/bin/collections/.empty deleted file mode 100644 index e69de29bb2..0000000000