From patchwork Tue May 18 19:58:27 2021 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: 4340 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Fl6JB57Bmz3wbk for ; Tue, 18 May 2021 19:58:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Fl6J94QLmz297; Tue, 18 May 2021 19:58:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Fl6J92QMTz2yTb; Tue, 18 May 2021 19:58:33 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Fl6J85BfGz2xWR for ; Tue, 18 May 2021 19:58:32 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Fl6J6407Dzpq for ; Tue, 18 May 2021 19:58:30 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1621367912; h=from:from: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; bh=JZzYIHGKa8Xz1ppi+cCAyJkXH5/iBZtgeJSC2wBkG5g=; b=du0Bpg3ywdY/ItQa8oDzS7kOHeqkpULrm5DgOHc+vke7KugVFgvwwwFSa03v9GjAKjR1Kx 3V9+Xf4u2kWNkZCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1621367912; h=from:from: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; bh=JZzYIHGKa8Xz1ppi+cCAyJkXH5/iBZtgeJSC2wBkG5g=; b=sRqltWs1t15XcBtn5sdxyvguTkMKWtUqttx/jrfz3p37ZkTvJjdyC9f8tQgZWqRWT2ko59 ZlOOHnC56ZLyZfdPHzKYPHolztkSHcT1PS5u3NgAbTjVaK+C3fP0C+kKxQkvxl4HwghRVQ cuwT5KOSYyrPGTJckVTgFBxLZInhm4aqGlutioDNbc4V5gJ+A+3w7pjShW6fRglysQLWtL y+tUQsixTnCztHrCZ6PcRh40H+9mSYoEzNvxVSFMubwaqEchWBw7tPpSWaFMAMlFkiWxZ2 fVrw+vCxllfcc01fdRNZaJJ/QgPtDZm1LiLQ8cAlWehX7u8kbZfNj0zQOYsY5w== To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] miniupnpd: Delete files that would have become orphaned after deletion of miniupnpd add-on as well Message-ID: <701e4761-950d-71d1-d423-ecd8908decd2@ipfire.org> Date: Tue, 18 May 2021 21:58:27 +0200 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 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" This patch requires https://patchwork.ipfire.org/project/ipfire/list/?series=2059 to be applied in the first place. Signed-off-by: Peter Müller --- config/miniupnpd/miniupnpd.conf | 50 ------------------- .../networking/red.down/10-miniupnpd | 6 --- .../networking/red.up/10-miniupnpd | 6 --- 3 files changed, 62 deletions(-) delete mode 100644 config/miniupnpd/miniupnpd.conf delete mode 100644 src/initscripts/networking/red.down/10-miniupnpd delete mode 100644 src/initscripts/networking/red.up/10-miniupnpd diff --git a/config/miniupnpd/miniupnpd.conf b/config/miniupnpd/miniupnpd.conf deleted file mode 100644 index 582758192..000000000 --- a/config/miniupnpd/miniupnpd.conf +++ /dev/null @@ -1,50 +0,0 @@ - -# LAN network interfaces IPs / networks -# there can be multiple listening ips for SSDP traffic. -# should be under the form nnn.nnn.nnn.nnn/nn -listening_ip=green0 -#listening_ip=green1 - -# HTTP is available on all interfaces -# port for HTTP (descriptions and SOAP) traffic. set 0 for autoselect. -port=0 - -# chain names for netfilter (not used for pf or ipf). -upnp_forward_chain=UPNPFW -upnp_nat_chain=UPNPFW - -# bitrates reported by daemon in bits per second -bitrate_up=1000000 -bitrate_down=10000000 - -# "secure" mode : when enabled, UPnP client are allowed to add mappings only -# to their IP. -secure_mode=yes - -# report system uptime instead of daemon uptime -system_uptime=yes - -# notify interval in seconds. default is 30 seconds. -notify_interval=60 - -# unused rules cleaning. -# never remove any rule before this threshold for the number -# of redirections is exceeded. default to 20 -#clean_ruleset_threshold=10 -# clean process work interval in seconds. default to 0 (disabled). -# a 600 seconds (10 minutes) interval makes sense -clean_ruleset_interval=600 - -# serial and model number the daemon will report to clients -# in its XML description -serial=12345678 -model_number=1 - -# UPnP permission rules -# (allow|deny) (external port range) ip/mask (internal port range) -# A port range is - or if there is only -# one port in the range. -# ip/mask format must be nn.nn.nn.nn/nn -# it is advised to only allow redirection of port above 1024 -# and to finish the rule set with "deny 0-65535 0.0.0.0/0 0-65535" -allow 0-65535 0.0.0.0/0 0-65535 diff --git a/src/initscripts/networking/red.down/10-miniupnpd b/src/initscripts/networking/red.down/10-miniupnpd deleted file mode 100644 index eaf2239e9..000000000 --- a/src/initscripts/networking/red.down/10-miniupnpd +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -[ -x /etc/init.d/miniupnpd ] && \ - /etc/init.d/miniupnpd stop &>/dev/null - -exit 0 diff --git a/src/initscripts/networking/red.up/10-miniupnpd b/src/initscripts/networking/red.up/10-miniupnpd deleted file mode 100644 index 54431331b..000000000 --- a/src/initscripts/networking/red.up/10-miniupnpd +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -[ -x /etc/init.d/miniupnpd ] && \ - /etc/init.d/miniupnpd start &>/dev/null - -exit 0