From patchwork Fri Apr 27 05:44:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 1730 Return-Path: Received: from mail01.ipfire.org (mail01.ipfire.org [IPv6:2001:470:7183:25::1]) by web02.i.ipfire.org (Postfix) with ESMTP id AB3F160B61 for ; Thu, 26 Apr 2018 21:45:02 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 72FBE1109343; Thu, 26 Apr 2018 20:45:01 +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 [37.120.167.53]) (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 3DF1A108B89E for ; Thu, 26 Apr 2018 20:44:59 +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=1524771898; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KPzCs0CfikiP6SLorcQkFPIrf556Y4qWNUIoEWzhr4M=; b=LnbiSTcVKIRAkTtR/EYJuCffxh1m/1REv+fZ10YIj34p/AhXZfP569Tyb3SPAt0EpncRQ4 h0eaYYCJ0713jc2tiNVvmmQXf2zriDbhUmlI7HqaykxoruwYetcIcA40DGSmLwuBebg97/ roRrsU3fJcIyWV0tkTF9OKI0KYmA2m4HSDjFdax30huJk+oNeQ1raH4Fgoy1mAP5BewpUB 1DFaWgb/htxKeoICv9cgAKdn+HNuDimeWLqVfd4B/7bMLriYVxmF25Fa/MSFybfDsNSfWs UJ4dGWA5O5lSYZaZ4T50hiPVQZfl+/cdkJ5IiVyDYOAUJEU2evGOvW46qFr6SA== ARC-Seal: i=1; s=201803; d=link38.eu; t=1524771898; a=rsa-sha256; cv=none; b=UNkTDglARvcrULri/iRvwO7wsqN/27fuX6Oo2KPl2ZMnHDMB9okzFCt6pyGnrHb8Y++mKBkEvnV+DECUxOSiABZzg2yUFPXlWwWzP0rYlyssk+d2lYIbgVmRCYkqkPTEfJPDkIeCXY7qVyDQFWiKMz+5duX9K8pFljekBFA7ajZ0MiGEvMkXoDrKNHPvWVyM8dDhrRa5VS5KX26/E6H3Re/bFI0T0A6SvKqt14pmTmpQl0yddUD2Ja0hVdbG+s303ShFnIsup/6wwaIfWNThUrcpQIOELLVzQPuTmCJZV7rJT72V0AkIwOVtdjWKLy+3eGelK7deitEBklKwKKOC3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=link38.eu; s=201803; t=1524771898; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KPzCs0CfikiP6SLorcQkFPIrf556Y4qWNUIoEWzhr4M=; b=WRAKOVvTD47KLOF09fr8+cibN0vrE6ZcTEG98s4VxwTMjpH5njkfoHtiaudkXZzGtOoc1i 60WzTCyogqb20Jy5h6ZnUizThxuWj42sbB9OPrCMW6NswxTGFaAbTY6uYVDjwVG/R/ti3W fPOOsoKJuGXxEpZ2+JpzPUhA3y3PYBR8vTQqTvlHJtU4eEu2jZwAOpHiEqLvXPvWGAChKe k39ZkTDFUoQ6LJeYlYOPII2bc3jdKMGR3M/SMpqT7rhog5jFHFjMAUN1qI3lqT85Xbj+Qn HgyYFaZD4Re5+5gBQBs8DecUcUGmk6f5UPPxu6kBlGktttsZ3OmsbSZA39iZww== Subject: [PATCH v3] remove forgotten Nagios files, if any To: Michael Tremer References: <9d8304a8-aeaa-9e6e-45ef-548c33b86989@link38.eu> <1524562503.1637848.273.camel@ipfire.org> <1524581883.2274586.39.camel@ipfire.org> <035d75cb-6ca2-e5f4-d9f8-c78906776c12@link38.eu> <1524762102.2479471.90.camel@ipfire.org> <6df706d4-931b-3235-d56b-5bc5c9a457e7@link38.eu> <1524763607.2479471.93.camel@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= Message-ID: <5c916c24-237a-8f3d-9b11-b1b28e6e2630@link38.eu> Date: Thu, 26 Apr 2018 21:44:56 +0200 MIME-Version: 1.0 In-Reply-To: <1524763607.2479471.93.camel@ipfire.org> Content-Language: en-US X-Spamd-Result: default: False [-12.54 / 11.00]; RCPT_COUNT_TWO(0.00)[2]; ARC_ALLOW(-1.00)[i=1]; RCVD_IN_DNSWL_MED(-2.00)[53.167.120.37.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]; IP_SCORE(-3.78)[ip: (-9.90), ipnet: 37.120.160.0/19(-4.95), asn: 197540(-3.95), country: DE(-0.09)]; BAYES_HAM(-3.00)[100.00%]; DKIM_TRACE(0.00)[link38.eu:+]; REPLY(-2.00)[]; TO_DN_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:37.120.167.53]; TO_MATCH_ENVRCPT_SOME(0.00)[]; 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:37.120.160.0/19, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Status: No, score=-12.54 X-Rspamd-Server: mail01.i.ipfire.org Cc: "IPFire: Development-List" X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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 . # +# Copyright (C) 2018 IPFire-Team . # # # ############################################################################ # . /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