From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH v2] remove forgotten Nagios files, if any
Date: Thu, 26 Apr 2018 18:26:47 +0100
Message-ID: <1524763607.2479471.93.camel@ipfire.org>
In-Reply-To: <6df706d4-931b-3235-d56b-5bc5c9a457e7@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1346000285009285454=="
List-Id: <development.lists.ipfire.org>

--===============1346000285009285454==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

On Thu, 2018-04-26 at 19:25 +0200, Peter M=C3=BCller wrote:
> Hello Michael,
>=20
> thanks for the quick feedback.
> > Hey,
> >=20
> > On Thu, 2018-04-26 at 17:17 +0200, Peter M=C3=BCller 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.
> > >=20
> > > 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 f=
or
> > > Core Update 121.
> > >=20
> > > Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
> > > ---
> > >  config/rootfiles/core/121/update.sh | 18 ++++++++++++++++--
> > >  1 file changed, 16 insertions(+), 2 deletions(-)
> > >=20
> > > 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 #
> > >  #                                                                     =
  =20
> > >   #
> > > -# Copyright (C) 2017 IPFire-Team <info(a)ipfire.org>.                 =
    =20
> > >   #
> > > +# Copyright (C) 2018 IPFire-Team <info(a)ipfire.org>.                 =
    =20
> > >   #
> > >  #                                                                     =
  =20
> > >   #
> > >  ######################################################################=
###
> > > ###
> > >  #
> > >  . /opt/pakfire/lib/functions.sh
> > >  /usr/local/bin/backupctrl exclude >/dev/null 2>&1
> > > =20
> > > -core=3D120
> > > +core=3D121
> > > =20
> > >  # Remove old core updates from pakfire cache to save space...
> > >  for (( i=3D1; i<=3D$core; i++ )); do
> > > @@ -42,7 +42,21 @@ ldconfig
> > >  # Update Language cache
> > >  /usr/local/bin/update-lang-cache
> > > =20
> > > +# 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/
> >=20
> > 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.
>=20
> Well, we can never be sure... :-) Will change that in the 3rd version.
> >=20
> > 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.
>=20
> I am afraid I did not get it. Do you mean something like
>=20
> rm -f [file1] [file2] [file3] ...
>=20
> or
>=20
> for i in (file1, file2, file3, ...); do
> 	rm -f $i;
> done;

Like this:

https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dblob;f=3Dconfig/rootfiles/oldc=
ore/119/update.sh;h=3D8ada474553cf3e87ea2367e560532816ea9ecdc9;hb=3DHEAD#l37

Don't forget to add the -r if you need it.

>=20
> ?
>=20
> Thanks,
> Peter M=C3=BCller
> >=20
> > > +
> > >  # Start services
> > > +/etc/init.d/apache restart
> > > =20
> > >  # This update needs a reboot...
> > >  touch /var/run/need_reboot

--===============1346000285009285454==--