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.
Signed-off-by: Peter Müller peter.mueller@link38.eu --- config/rootfiles/core/120/update.sh | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh index e4ee15b52..310f669c1 100644 --- a/config/rootfiles/core/120/update.sh +++ b/config/rootfiles/core/120/update.sh @@ -86,6 +86,12 @@ done # Remove deprecated SSH configuration option sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config
+# 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 -d /usr/share/nagios/ && rm -rf /usr/share/nagios/ +test -d /var/nagios/ && rm -rf /var/nagios/ + # Remove any pakfire keys stored in / rm -rfv /.gnupg
Hey,
the nagios package should have been removed automatically and remove all program files with it. Did you install a testing core update?
Also, Core Update 120 is being packaged and distributed on the servers so far. If nothing major needs fixing, I would like to avoid rebuilding this only for this patch.
Best, -Michael
On Mon, 2018-04-23 at 16:38 +0200, Peter Müller wrote:
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.
Signed-off-by: Peter Müller peter.mueller@link38.eu
config/rootfiles/core/120/update.sh | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh index e4ee15b52..310f669c1 100644 --- a/config/rootfiles/core/120/update.sh +++ b/config/rootfiles/core/120/update.sh @@ -86,6 +86,12 @@ done # Remove deprecated SSH configuration option sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config
+# 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 -d /usr/share/nagios/ && rm -rf /usr/share/nagios/ +test -d /var/nagios/ && rm -rf /var/nagios/
# Remove any pakfire keys stored in / rm -rfv /.gnupg
Hello Michael,
Hey,
the nagios package should have been removed automatically and remove all program files with it. Did you install a testing core update?
At the moment, yes (Core Update 120), but that appeared before, too. Maybe the dependency to NRPE blocked something from being removed here (issue can be reproduced on two systems, one of them was never on testing tree).
Also, Core Update 120 is being packaged and distributed on the servers so far. If nothing major needs fixing, I would like to avoid rebuilding this only for this patch. From my point of view, there is no rush here. I am fine pushing this in Core Update
121. Just want to clean up the disk.
Best regards, Peter Müller
Best, -Michael
On Mon, 2018-04-23 at 16:38 +0200, Peter Müller wrote:
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.
Signed-off-by: Peter Müller peter.mueller@link38.eu
config/rootfiles/core/120/update.sh | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh index e4ee15b52..310f669c1 100644 --- a/config/rootfiles/core/120/update.sh +++ b/config/rootfiles/core/120/update.sh @@ -86,6 +86,12 @@ done # Remove deprecated SSH configuration option sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config
+# 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 -d /usr/share/nagios/ && rm -rf /usr/share/nagios/ +test -d /var/nagios/ && rm -rf /var/nagios/
# Remove any pakfire keys stored in / rm -rfv /.gnupg
Hello,
the patch is missing the apache vhost configuration file, /usr/bin/p1.pl and the symlinks in /etc/rc.d/rc*.d
https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=config/rootfiles/packages/... os;h=971a36061f7c2215973e0c4dad47e6ca6824e2a7;hb=refs/heads/core116
-Michael
On Tue, 2018-04-24 at 16:54 +0200, Peter Müller wrote:
Hello Michael,
Hey,
the nagios package should have been removed automatically and remove all program files with it. Did you install a testing core update?
At the moment, yes (Core Update 120), but that appeared before, too. Maybe the dependency to NRPE blocked something from being removed here (issue can be reproduced on two systems, one of them was never on testing tree).
Also, Core Update 120 is being packaged and distributed on the servers so far. If nothing major needs fixing, I would like to avoid rebuilding this only for this patch.
From my point of view, there is no rush here. I am fine pushing this in Core Update 121. Just want to clean up the disk.
Best regards, Peter Müller
Best, -Michael
On Mon, 2018-04-23 at 16:38 +0200, Peter Müller wrote:
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.
Signed-off-by: Peter Müller peter.mueller@link38.eu
config/rootfiles/core/120/update.sh | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh index e4ee15b52..310f669c1 100644 --- a/config/rootfiles/core/120/update.sh +++ b/config/rootfiles/core/120/update.sh @@ -86,6 +86,12 @@ done # Remove deprecated SSH configuration option sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config
+# 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 -d /usr/share/nagios/ && rm -rf /usr/share/nagios/ +test -d /var/nagios/ && rm -rf /var/nagios/
# Remove any pakfire keys stored in / rm -rfv /.gnupg
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@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@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,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
Hey,
On Thu, 2018-04-26 at 17:17 +0200, Peter Müller wrote:
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@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@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,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/
There is no need to test if the files or directories exist before deleting with rm -f. rm won't do anything if the files don't exist.
You can also just call rm once and add all files in one go. That would be tidier and if you would then sort the arguments alphabetically work well when someone extends it. Patches won't conflict then unless the same lines are being changed.
# Start services +/etc/init.d/apache restart
# This update needs a reboot... touch /var/run/need_reboot
Hello Michael,
thanks for the quick feedback.
Hey,
On Thu, 2018-04-26 at 17:17 +0200, Peter Müller wrote:
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@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@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,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/
There is no need to test if the files or directories exist before deleting with rm -f. rm won't do anything if the files don't exist.
Well, we can never be sure... :-) Will change that in the 3rd version.
You can also just call rm once and add all files in one go. That would be tidier and if you would then sort the arguments alphabetically work well when someone extends it. Patches won't conflict then unless the same lines are being changed.
I am afraid I did not get it. Do you mean something like
rm -f [file1] [file2] [file3] ...
or
for i in (file1, file2, file3, ...); do rm -f $i; done;
?
Thanks, Peter Müller
# Start services +/etc/init.d/apache restart
# This update needs a reboot... touch /var/run/need_reboot
On Thu, 2018-04-26 at 19:25 +0200, Peter Müller wrote:
Hello Michael,
thanks for the quick feedback.
Hey,
On Thu, 2018-04-26 at 17:17 +0200, Peter Müller wrote:
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@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@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,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/
There is no need to test if the files or directories exist before deleting with rm -f. rm won't do anything if the files don't exist.
Well, we can never be sure... :-) Will change that in the 3rd version.
You can also just call rm once and add all files in one go. That would be tidier and if you would then sort the arguments alphabetically work well when someone extends it. Patches won't conflict then unless the same lines are being changed.
I am afraid I did not get it. Do you mean something like
rm -f [file1] [file2] [file3] ...
or
for i in (file1, file2, file3, ...); do rm -f $i; done;
Like this:
https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=config/rootfiles/oldcore/1...
Don't forget to add the -r if you need it.
?
Thanks, Peter Müller
# Start services +/etc/init.d/apache restart
# This update needs a reboot... touch /var/run/need_reboot
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 --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
-
Michael Tremer -
Peter Müller