From: Peter Müller Date: Thu, 26 Apr 2018 19:44:56 +0000 (+0200) Subject: remove forgotten Nagios files, if any X-Git-Tag: v2.21-core122~180 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8858180db5715072aefa784809538aa96be90466;p=ipfire-2.x.git remove forgotten Nagios files, if any 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 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/core/121/update.sh index 9986316e9f..87d5f6ebd4 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 . # +# Copyright (C) 2018 IPFire-Team . # # # ############################################################################ # . /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