[v2] 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 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(-)
  

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/119/update.sh;h=8ada474553cf3e87ea2367e560532816ea9ecdc9;hb=HEAD#l37

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