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.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
---
 config/rootfiles/core/120/update.sh | 6 ++++++
 1 file changed, 6 insertions(+)
  

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/nagi
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
> > >