Message ID | 9d8304a8-aeaa-9e6e-45ef-548c33b86989@link38.eu |
---|---|
State | Superseded |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id B6270600A1 for <patchwork@web02.i.ipfire.org>; Mon, 23 Apr 2018 16:38:18 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 36CB610FE24D; Mon, 23 Apr 2018 15:38:18 +0100 (BST) Authentication-Results: dkim=pass header.d=link38.eu; dmarc=pass (policy=none) header.from=link38.eu; spf=pass smtp.mailfrom=peter.mueller@link38.eu Received: from mx-nbg.link38.eu (mx-nbg.link38.eu [IPv6:2a03:4000:6:432c:1f9e:48:ac3:199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx-nbg.link38.eu", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id F2D7C108B8B7 for <development@lists.ipfire.org>; Mon, 23 Apr 2018 15:38:16 +0100 (BST) ARC-Authentication-Results: i=1; mx-nbg.link38.eu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=link38.eu; s=201803; t=1524494296; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=0Kg1laXMbPVk/AWxrH+u/6AXk1jOD9kUqpC2C7a+Dmg=; b=cTj0c3mZQ+wx+03kJsEdKpBsxBUF6TS9pv+MRfLqp2HG/6E85edKalX8Ks5PcYDRcyfRLQ KQHvNtKcFxK8hM/JMvO4tecbhM0v4m1ibvfWasBu/OgzFfZ8rS52aSjowE6rh69hi0GHvx Sm1ORtxj3zFv1nVzoa+TPV3UQV5kSOcX2TdWbDh+FGawg1mLl7LFP5+Z+fx2dem/UhxOJ1 1414xZpS77RTON/qVOiXDD7ZlsDlWlZmYPCyHKw6TUjVkuAx7mtY+ebTF0axRTgV4cKM8Y zTouZKCF7IFa3GoWQTrdhurAWfLaTqlhFcmFH+79BB1wgN7DyGDmxnvjnalj4Q== ARC-Seal: i=1; s=201803; d=link38.eu; t=1524494296; a=rsa-sha256; cv=none; b=IZcclx+O+kgI9BSoSlhx4/JuftzHokHhyhoBmm1oUScKBfPGn3gqJsjnazE0+JTJlFMhU9vehWGz1XdKKdoGGF6qMeqzq87XSXDhH78rwYQcYlhcXuNkC2kKaPOhqiRZltAAZ+nA+49dRzgvRCc+ZUzNeqvstyDNUR6KL4mBIoEJsnDs2wbsUTO8+YeiJfDWznV9OvY95ucq/0eSRBSC+bZMmQOLm5A9b4MRyqcmPqoUonETUWffXecD5/usy8nVJlTUKas387WTk7hEZiphUyxGGsYvzb//WtGDTuttkDJ1OZy9ZGBqYk3MqyNyWB1LjoHN5W28PbO/eNu4BB+rPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=link38.eu; s=201803; t=1524494296; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=0Kg1laXMbPVk/AWxrH+u/6AXk1jOD9kUqpC2C7a+Dmg=; b=S8epgByWwxFGQQp3sFM3vBv7HLK1qTpKZTIpKrgyDbQc+yYTkoXGhRm57+hbUPjPHeACNS sO4gM0SnVBpHXIXv8sN7pijpfA+VH8n2tOBkXrXid0YSZ+5Zt9ykOM8PqAEoND2/x+YwFn CbqP4QgtD+yNIyd86E97MpWIGqT8L62wh4PSwnPQxk/FHNab5E9u5e9gsf7/jpd7v49RQO rRPcpbc+GNbubs5BBKSJ0/1K4/5uVpwDY+3xTlo0XKprJ/woBib5DKJZkomgs61/YCbDcJ +KpVd6BPdXA6PSo8uJHwkIG8VkRX2rOrwQDK7dwYisF7SFVCtXF+guadqSYAMA== To: "IPFire: Development-List" <development@lists.ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= <peter.mueller@link38.eu> Subject: [PATCH] remove forgotten Nagios files, if any Message-ID: <9d8304a8-aeaa-9e6e-45ef-548c33b86989@link38.eu> Date: Mon, 23 Apr 2018 16:38:15 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-10.48 / 11.00]; IP_SCORE(-3.74)[ip: (-9.78), ipnet: 2a03:4000::/32(-4.89), asn: 197540(-3.93), country: DE(-0.08)]; ARC_ALLOW(-1.00)[i=1]; RCVD_IN_DNSWL_MED(-2.00)[9.9.1.0.3.c.a.0.8.4.0.0.e.9.f.1.c.2.3.4.6.0.0.0.0.0.0.4.3.0.a.2.list.dnswl.org : 127.0.6.2]; RCVD_COUNT_ZERO(0.00)[0]; FROM_HAS_DN(0.00)[]; MX_GOOD(-0.01)[cached: mx-nbg.link38.eu]; BAYES_HAM(-2.99)[99.95%]; DKIM_TRACE(0.00)[link38.eu:+]; TO_DN_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a03:4000:6:432c:1f9e:48:ac3:199]; RCPT_COUNT_ONE(0.00)[1]; DMARC_POLICY_ALLOW(-0.25)[link38.eu,none]; FROM_EQ_ENVFROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_DKIM_ALLOW(-0.20)[link38.eu]; ASN(0.00)[asn:197540, ipnet:2a03:4000::/32, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Status: No, score=-10.48 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <https://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Series |
remove forgotten Nagios files, if any
|
|
Commit Message
Peter Müller
April 24, 2018, 12:38 a.m. UTC
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(+)
Comments
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 > > >
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