diff mbox series

[2/4] configroot: Drop config file for p2protocols.

Message ID 20220214190307.4086-2-stefan.schantl@ipfire.org
State Accepted
Commit 31c64b9d0df0599f1f3f47975ad7c6c11ebdd288
Headers
Series [1/4] firewall: Drop support for blocking P2P protocols. |

Commit Message

Stefan Schantl Feb. 14, 2022, 7:03 p.m. UTC 
  The support for creating P2P based rules has been removed from the
firewall. So this file is not longer needed.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 config/firewall/p2protocols        | 9 ---------
 config/rootfiles/common/configroot | 1 -
 lfs/configroot                     | 1 -
 3 files changed, 11 deletions(-)
 delete mode 100644 config/firewall/p2protocols

Comments

Peter Müller Feb. 14, 2022, 9:11 p.m. UTC | #1 
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

> The support for creating P2P based rules has been removed from the
> firewall. So this file is not longer needed.
> 
> Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
> ---
>  config/firewall/p2protocols        | 9 ---------
>  config/rootfiles/common/configroot | 1 -
>  lfs/configroot                     | 1 -
>  3 files changed, 11 deletions(-)
>  delete mode 100644 config/firewall/p2protocols
> 
> diff --git a/config/firewall/p2protocols b/config/firewall/p2protocols
> deleted file mode 100644
> index d8998095c..000000000
> --- a/config/firewall/p2protocols
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -Applejuice;apple;on;
> -Ares;ares;on;
> -Bittorrent;bit;on;
> -DirectConnect;dc;on;
> -Edonkey;edk;on;
> -Gnutella;gnu;on;
> -KaZaA;kazaa;on;
> -SoulSeek;soul;on;
> -WinMX;winmx;on;
> diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
> index 904c718c3..fef5ffbcf 100644
> --- a/config/rootfiles/common/configroot
> +++ b/config/rootfiles/common/configroot
> @@ -63,7 +63,6 @@ var/ipfire/firewall
>  #var/ipfire/firewall/input
>  #var/ipfire/firewall/locationblock
>  #var/ipfire/firewall/outgoing
> -#var/ipfire/firewall/p2protocols
>  #var/ipfire/firewall/settings
>  var/ipfire/fwhosts
>  #var/ipfire/fwhosts/customgroups
> diff --git a/lfs/configroot b/lfs/configroot
> index 9f3188aab..b836767c1 100644
> --- a/lfs/configroot
> +++ b/lfs/configroot
> @@ -105,7 +105,6 @@ $(TARGET) :
>  	cp $(DIR_SRC)/config/firewall/convert-outgoingfw	/usr/sbin/convert-outgoingfw
>  	cp $(DIR_SRC)/config/firewall/convert-dmz	/usr/sbin/convert-dmz
>  	cp $(DIR_SRC)/config/firewall/convert-portfw	/usr/sbin/convert-portfw
> -	cp $(DIR_SRC)/config/firewall/p2protocols		$(CONFIG_ROOT)/firewall/p2protocols
>  	cp $(DIR_SRC)/config/firewall/firewall-policy	/usr/sbin/firewall-policy
>  	cp $(DIR_SRC)/config/fwhosts/icmp-types			$(CONFIG_ROOT)/fwhosts/icmp-types
>  	cp $(DIR_SRC)/config/fwhosts/customservices		$(CONFIG_ROOT)/fwhosts/customservices
Michael Tremer Feb. 15, 2022, 12:33 p.m. UTC | #2 
Acked-by: Michael Tremer <michael.tremer@ipfire.org>

> On 14 Feb 2022, at 21:11, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
> 
>> The support for creating P2P based rules has been removed from the
>> firewall. So this file is not longer needed.
>> 
>> Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
>> ---
>> config/firewall/p2protocols        | 9 ---------
>> config/rootfiles/common/configroot | 1 -
>> lfs/configroot                     | 1 -
>> 3 files changed, 11 deletions(-)
>> delete mode 100644 config/firewall/p2protocols
>> 
>> diff --git a/config/firewall/p2protocols b/config/firewall/p2protocols
>> deleted file mode 100644
>> index d8998095c..000000000
>> --- a/config/firewall/p2protocols
>> +++ /dev/null
>> @@ -1,9 +0,0 @@
>> -Applejuice;apple;on;
>> -Ares;ares;on;
>> -Bittorrent;bit;on;
>> -DirectConnect;dc;on;
>> -Edonkey;edk;on;
>> -Gnutella;gnu;on;
>> -KaZaA;kazaa;on;
>> -SoulSeek;soul;on;
>> -WinMX;winmx;on;
>> diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
>> index 904c718c3..fef5ffbcf 100644
>> --- a/config/rootfiles/common/configroot
>> +++ b/config/rootfiles/common/configroot
>> @@ -63,7 +63,6 @@ var/ipfire/firewall
>> #var/ipfire/firewall/input
>> #var/ipfire/firewall/locationblock
>> #var/ipfire/firewall/outgoing
>> -#var/ipfire/firewall/p2protocols
>> #var/ipfire/firewall/settings
>> var/ipfire/fwhosts
>> #var/ipfire/fwhosts/customgroups
>> diff --git a/lfs/configroot b/lfs/configroot
>> index 9f3188aab..b836767c1 100644
>> --- a/lfs/configroot
>> +++ b/lfs/configroot
>> @@ -105,7 +105,6 @@ $(TARGET) :
>> 	cp $(DIR_SRC)/config/firewall/convert-outgoingfw	/usr/sbin/convert-outgoingfw
>> 	cp $(DIR_SRC)/config/firewall/convert-dmz	/usr/sbin/convert-dmz
>> 	cp $(DIR_SRC)/config/firewall/convert-portfw	/usr/sbin/convert-portfw
>> -	cp $(DIR_SRC)/config/firewall/p2protocols		$(CONFIG_ROOT)/firewall/p2protocols
>> 	cp $(DIR_SRC)/config/firewall/firewall-policy	/usr/sbin/firewall-policy
>> 	cp $(DIR_SRC)/config/fwhosts/icmp-types			$(CONFIG_ROOT)/fwhosts/icmp-types
>> 	cp $(DIR_SRC)/config/fwhosts/customservices		$(CONFIG_ROOT)/fwhosts/customservices
diff mbox series

Patch

diff --git a/config/firewall/p2protocols b/config/firewall/p2protocols
deleted file mode 100644
index d8998095c..000000000
--- a/config/firewall/p2protocols
+++ /dev/null
@@ -1,9 +0,0 @@ 
-Applejuice;apple;on;
-Ares;ares;on;
-Bittorrent;bit;on;
-DirectConnect;dc;on;
-Edonkey;edk;on;
-Gnutella;gnu;on;
-KaZaA;kazaa;on;
-SoulSeek;soul;on;
-WinMX;winmx;on;
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 904c718c3..fef5ffbcf 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -63,7 +63,6 @@  var/ipfire/firewall
 #var/ipfire/firewall/input
 #var/ipfire/firewall/locationblock
 #var/ipfire/firewall/outgoing
-#var/ipfire/firewall/p2protocols
 #var/ipfire/firewall/settings
 var/ipfire/fwhosts
 #var/ipfire/fwhosts/customgroups
diff --git a/lfs/configroot b/lfs/configroot
index 9f3188aab..b836767c1 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -105,7 +105,6 @@  $(TARGET) :
 	cp $(DIR_SRC)/config/firewall/convert-outgoingfw	/usr/sbin/convert-outgoingfw
 	cp $(DIR_SRC)/config/firewall/convert-dmz	/usr/sbin/convert-dmz
 	cp $(DIR_SRC)/config/firewall/convert-portfw	/usr/sbin/convert-portfw
-	cp $(DIR_SRC)/config/firewall/p2protocols		$(CONFIG_ROOT)/firewall/p2protocols
 	cp $(DIR_SRC)/config/firewall/firewall-policy	/usr/sbin/firewall-policy
 	cp $(DIR_SRC)/config/fwhosts/icmp-types			$(CONFIG_ROOT)/fwhosts/icmp-types
 	cp $(DIR_SRC)/config/fwhosts/customservices		$(CONFIG_ROOT)/fwhosts/customservices