From 4e851a567ee703c0161ee714d6d7f0551f19a298 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Mon, 27 Feb 2017 13:06:19 +0100 Subject: [PATCH 1/3] Fixed setgid (rpm & pandora_server_installer) --- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 5349691f3c..4f312a82e9 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -175,7 +175,7 @@ exit 0 %defattr(600,root,root) /etc/pandora/pandora_server.conf.new -%defattr(-,pandora,apache,770) +%defattr(-,pandora,apache,2770) %{_localstatedir}/spool/pandora %{_localstatedir}/spool/pandora/data_in %{_localstatedir}/spool/pandora/data_in/md5 diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index aa42a0eb69..2a3db3d822 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -170,7 +170,7 @@ rm -Rf /usr/share/man/man1/tentacle_server.1.gz %{prefix}/pandora_server /var/log/pandora -%defattr(-,pandora,www,770) +%defattr(-,pandora,www,2770) /var/spool/pandora /var/spool/pandora/data_in /var/spool/pandora/data_in/md5 diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index c352c43576..d965f20532 100644 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -135,6 +135,7 @@ install_startup_script () { SCRIPT_NAME=`basename $SRC` echo "Copying the daemon script into $INITDIR" + [ -d $DESTDIR$INITDIR ] || mkdir -p $DESTDIR$INITDIR cp $SRC $DESTDIR$INITDIR [ "$DESTDIR" ] && return @@ -256,6 +257,7 @@ install () { fi if [ "$DISTRO" != "FreeBSD" ] && [ "$DISTRO" != "NetBSD" ] then + [ -d $DESTDIR$PREFIX/bin ] || mkdir -p $DESTDIR$PREFIX/bin ln -s /usr/local/bin/pandora_server $DESTDIR$PREFIX/bin ln -s /usr/local/bin/pandora_exec $DESTDIR$PREFIX/bin ln -s /usr/local/bin/tentacle_server $DESTDIR$PREFIX/bin @@ -295,18 +297,18 @@ install () { fi mkdir -p $DESTDIR$PANDORA_SPOOL/data_in 2> /dev/null - chmod 770 $DESTDIR$PANDORA_SPOOL/data_in + chmod 2770 $DESTDIR$PANDORA_SPOOL/data_in mkdir $DESTDIR$PANDORA_SPOOL/data_in/conf 2> /dev/null - chmod 770 $DESTDIR$PANDORA_SPOOL/data_in/conf + chmod 2770 $DESTDIR$PANDORA_SPOOL/data_in/conf mkdir $DESTDIR$PANDORA_SPOOL/data_in/md5 2> /dev/null - chmod 770 $DESTDIR$PANDORA_SPOOL/data_in/md5 + chmod 2770 $DESTDIR$PANDORA_SPOOL/data_in/md5 mkdir $DESTDIR$PANDORA_SPOOL/data_in/collections 2> /dev/null - chmod 770 $DESTDIR$PANDORA_SPOOL/data_in/collections + chmod 2770 $DESTDIR$PANDORA_SPOOL/data_in/collections mkdir $DESTDIR$PANDORA_SPOOL/data_in/netflow 2> /dev/null - chmod 770 $DESTDIR$PANDORA_SPOOL/data_in/netflow + chmod 2770 $DESTDIR$PANDORA_SPOOL/data_in/netflow mkdir -p $DESTDIR$PANDORA_LOG 2> /dev/null chown -R pandora $DESTDIR$PANDORA_LOG 2> /dev/null - chmod 770 $DESTDIR$PANDORA_LOG 2> /dev/null + chmod 2770 $DESTDIR$PANDORA_LOG 2> /dev/null echo "Giving proper permission to /var/spool/pandora" for group in "www-data" wwwrun www apache @@ -339,13 +341,14 @@ install () { fi echo "Installing Pandora Server manual" + [ -d $DESTDIR$MANDIR ] || mkdir -p $DESTDIR$MANDIR cp man/man1/pandora_server.1.gz $DESTDIR$MANDIR install_startup_script -s 90 $PANDORA_INIT_SCRIPT if [ -d /etc/logrotate.d ] then - [ -d $DESTDIR/etc/logrotate.d ] && mkdir -p $DESTDIR/etc/logrotate.d + [ -d $DESTDIR/etc/logrotate.d ] || mkdir -p $DESTDIR/etc/logrotate.d echo "Creating logrotate.d entry for Pandora FMS log management" cp util/pandora_server_logrotate $DESTDIR/etc/logrotate.d/pandora_server else @@ -372,7 +375,7 @@ install () { [ ! -d $DESTDIR/etc/cron.hourly ] && mkdir -p $DESTDIR/etc/cron.hourly echo "Creating the Cron script to run Pandora DB tool each hour" echo "#!/bin/bash" > $DESTDIR/etc/cron.hourly/pandora_db - echo "perl $PANDORA_HOME/util/pandora_db.pl /etc/pandora/pandora_server.conf" >> /etc/cron.hourly/pandora_db + echo "perl $PANDORA_HOME/util/pandora_db.pl /etc/pandora/pandora_server.conf" >> $DESTDIR/etc/cron.hourly/pandora_db chmod +x /etc/cron.hourly/pandora_db elif [ "$DISTRO" = "FreeBSD" ] || [ "$DISTRO" = "NetBSD" ] then From 3e977465fa101e009bd5e5b94c45bbc35a9b4da4 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Mon, 27 Feb 2017 13:16:18 +0100 Subject: [PATCH 2/3] Fixed crontab references in pandora_server_installer --- pandora_server/pandora_server_installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index d965f20532..ac5deb52f6 100644 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -375,7 +375,7 @@ install () { [ ! -d $DESTDIR/etc/cron.hourly ] && mkdir -p $DESTDIR/etc/cron.hourly echo "Creating the Cron script to run Pandora DB tool each hour" echo "#!/bin/bash" > $DESTDIR/etc/cron.hourly/pandora_db - echo "perl $PANDORA_HOME/util/pandora_db.pl /etc/pandora/pandora_server.conf" >> $DESTDIR/etc/cron.hourly/pandora_db + echo "perl $PANDORA_HOME/util/pandora_db.pl /etc/pandora/pandora_server.conf" >> /etc/cron.hourly/pandora_db chmod +x /etc/cron.hourly/pandora_db elif [ "$DISTRO" = "FreeBSD" ] || [ "$DISTRO" = "NetBSD" ] then From 39e1028e8cf7b28cf1df3cc140f2a05632c17199 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Mon, 27 Feb 2017 13:41:14 +0100 Subject: [PATCH 3/3] Revert "Fixed crontab references in pandora_server_installer" This reverts commit 3e977465fa101e009bd5e5b94c45bbc35a9b4da4. --- pandora_server/pandora_server_installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index ac5deb52f6..d965f20532 100644 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -375,7 +375,7 @@ install () { [ ! -d $DESTDIR/etc/cron.hourly ] && mkdir -p $DESTDIR/etc/cron.hourly echo "Creating the Cron script to run Pandora DB tool each hour" echo "#!/bin/bash" > $DESTDIR/etc/cron.hourly/pandora_db - echo "perl $PANDORA_HOME/util/pandora_db.pl /etc/pandora/pandora_server.conf" >> /etc/cron.hourly/pandora_db + echo "perl $PANDORA_HOME/util/pandora_db.pl /etc/pandora/pandora_server.conf" >> $DESTDIR/etc/cron.hourly/pandora_db chmod +x /etc/cron.hourly/pandora_db elif [ "$DISTRO" = "FreeBSD" ] || [ "$DISTRO" = "NetBSD" ] then