[PATCH] miniupnpd: Delete files that would have become orphaned after deletion of miniupnpd add-on as well

[PATCH] miniupnpd: Delete files that would have become orphaned after deletion of miniupnpd add-on as well

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 3189 bytes --]

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 <peter.mueller(a)ipfire.org>
---
 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 <min port>-<max port> or <port> 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
-- 
2.26.2

Re: [PATCH] miniupnpd: Delete files that would have become orphaned after deletion of miniupnpd add-on as well

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3556 bytes --]

This patch is lacking the changes to the root files.

I will take care of this.

-Michael

> On 18 May 2021, at 20:58, Peter Müller <peter.mueller(a)ipfire.org> wrote:
> 
> 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 <peter.mueller(a)ipfire.org>
> ---
> 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 <min port>-<max port> or <port> 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
> -- 
> 2.26.2

Re: [PATCH] miniupnpd: Delete files that would have become orphaned after deletion of miniupnpd add-on as well

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 3920 bytes --]

Hello Michael,

thanks for your reply.

Yes, I missed those indeed. They say intelligent life before the days' first coffee is possible
in theory, however completely illusionary in the real world. :-/

Thanks, and best regards,
Peter Müller


> This patch is lacking the changes to the root files.
> 
> I will take care of this.
> 
> -Michael
> 
>> On 18 May 2021, at 20:58, Peter Müller <peter.mueller(a)ipfire.org> wrote:
>>
>> 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 <peter.mueller(a)ipfire.org>
>> ---
>> 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 <min port>-<max port> or <port> 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
>> -- 
>> 2.26.2
>