diff mbox series

[v3] remove forgotten Nagios files, if any

Message ID 5c916c24-237a-8f3d-9b11-b1b28e6e2630@link38.eu
State Accepted
Commit 8858180db5715072aefa784809538aa96be90466
Headers
Series [v3] remove forgotten Nagios files, if any |

Commit Message

Peter Müller April 27, 2018, 5:44 a.m. UTC 
  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 third 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@link38.eu>
---
 config/rootfiles/core/121/update.sh | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/core/121/update.sh
index 9986316e9..87d5f6ebd 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@ipfire.org>.                        #
+# Copyright (C) 2018 IPFire-Team <info@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,22 @@  ldconfig
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
+# Remove Nagios files, if any...
+rm -rvf \
+	/etc/rc.d/init.d/nagios \
+	/usr/bin/nagios \
+	/etc/rc.d/rc6.d/K33nagios \
+	/etc/rc.d/rc3.d/off/S67nagios \
+	/etc/rc.d/rc0.d/K33nagios \
+	/etc/httpd/conf/conf.d/nagios.conf \
+	/etc/nagios/nagios.cfg \
+	/usr/bin/p1.pl \
+	/usr/bin/nagiostats \
+	/usr/share/nagios/ \
+	/var/nagios/
+
 # Start services
+/etc/init.d/apache restart
 
 # This update needs a reboot...
 touch /var/run/need_reboot