[PATCH v2] remove forgotten Nagios files, if any

["Peter Müller" <peter.mueller@link38.eu>]

[-- Attachment #1: Type: text/plain, Size: 2551 bytes --]

When we decided to drop Nagios, some files were not removed on the
installations. Since the package does not exist anymore, "pakfire remove
nagios" does not work so we need to clean them up manually in case they exist.

The second version of this patch makes sure Apache is restarted afterwards,
and includes some forgotten files [sic] as well as it is now applying for
Core Update 121.

Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
---
 config/rootfiles/core/121/update.sh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/core/121/update.sh
index 9986316e9..422f8f20f 100644
--- a/config/rootfiles/core/121/update.sh
+++ b/config/rootfiles/core/121/update.sh
@@ -17,14 +17,14 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2017 IPFire-Team <info(a)ipfire.org>.                        #
+# Copyright (C) 2018 IPFire-Team <info(a)ipfire.org>.                        #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 
-core=120
+core=121
 
 # Remove old core updates from pakfire cache to save space...
 for (( i=1; i<=$core; i++ )); do
@@ -42,7 +42,21 @@ ldconfig
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
+# Remove forgotten Nagios files, if any...
+test -f /etc/rc.d/init.d/nagios && rm -f /etc/rc.d/init.d/nagios
+test -f /usr/bin/nagios && rm -f /usr/bin/nagios
+test -f /etc/rc.d/rc6.d/K33nagios && rm -f /etc/rc.d/rc6.d/K33nagios
+test -f /etc/rc.d/rc3.d/off/S67nagios && rm -f /etc/rc.d/rc3.d/off/S67nagios
+test -f /etc/rc.d/rc0.d/K33nagios && rm -f /etc/rc.d/rc0.d/K33nagios
+test -f /etc/httpd/conf/conf.d/nagios.conf && rm -f /etc/httpd/conf/conf.d/nagios.conf
+test -f /etc/nagios/nagios.cfg && rm -f /etc/nagios/nagios.cfg
+test -f /usr/bin/p1.pl && rm -f /usr/bin/p1.pl
+test -f /usr/bin/nagiostats && rm -f /usr/bin/nagiostats
+test -d /usr/share/nagios/ && rm -rf /usr/share/nagios/
+test -d /var/nagios/ && rm -rf /var/nagios/
+
 # Start services
+/etc/init.d/apache restart
 
 # This update needs a reboot...
 touch /var/run/need_reboot
-- 
2.13.6