diff options
| author | Micah <micah@riseup.net> | 2017-02-13 15:37:50 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2017-02-13 15:37:50 +0000 |
| commit | 4da1590e18c487f1dc89d0ce1fffeb848e75794e (patch) | |
| tree | 517e1d0a4bfe8799ecff9df391940d5185594412 /files | |
| parent | 054ccc9e8ee0a03e98165ee44f113ce7ccf3bc5c (diff) | |
| parent | 4b3f8eac5f343b5ecd2354d16e83256b8413e807 (diff) | |
Merge branch '5.x-2' into 'master'
5.x changes part 2
See merge request !8
Diffstat (limited to 'files')
| -rw-r--r-- | files/boilerplate/blacklist.footer | 1 | ||||
| -rw-r--r-- | files/boilerplate/blacklist.header | 10 | ||||
| -rw-r--r-- | files/boilerplate/params.header | 4 | ||||
| -rw-r--r-- | files/boilerplate/started.header | 22 |
4 files changed, 12 insertions, 25 deletions
diff --git a/files/boilerplate/blacklist.footer b/files/boilerplate/blacklist.footer deleted file mode 100644 index 5e12d1d..0000000 --- a/files/boilerplate/blacklist.footer +++ /dev/null @@ -1 +0,0 @@ -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/files/boilerplate/blacklist.header b/files/boilerplate/blacklist.header deleted file mode 100644 index 2392e17..0000000 --- a/files/boilerplate/blacklist.header +++ /dev/null @@ -1,10 +0,0 @@ -# -# Shorewall version 3.4 - Blacklist File -# -# For information about entries in this file, type "man shorewall-blacklist" -# -# Please see http://shorewall.net/blacklisting_support.htm for additional -# information. -# -############################################################################### -#ADDRESS/SUBNET PROTOCOL PORT diff --git a/files/boilerplate/params.header b/files/boilerplate/params.header index b258b0d..c4dd504 100644 --- a/files/boilerplate/params.header +++ b/files/boilerplate/params.header @@ -13,7 +13,7 @@ # # NET_IF=eth0 # NET_BCAST=130.252.100.255 -# NET_OPTIONS=routefilter,norfc1918 +# NET_OPTIONS=routefilter # # Example (/etc/shorewall/interfaces record): # @@ -21,6 +21,6 @@ # # The result will be the same as if the record had been written # -# net eth0 130.252.100.255 routefilter,norfc1918 +# net eth0 130.252.100.255 routefilter # ############################################################################### diff --git a/files/boilerplate/started.header b/files/boilerplate/started.header index b7704db..4adc4b9 100644 --- a/files/boilerplate/started.header +++ b/files/boilerplate/started.header @@ -1,20 +1,18 @@ # -# Shorewall version 4 - Started File +# Shorewall -- /etc/shorewall/started # -# /etc/shorewall/started +# Add commands below that you want to be executed after shorewall has +# been completely started, reloaded or restarted. The difference between +# this extension script and /etc/shorewall/start is that this one is +# invoked after the 'shorewall' chain has been created (thus +# signaling that the firewall is completely up). # -# Add commands below that you want to be executed after shorewall has -# been completely started or restarted. The difference between this -# extension script and /etc/shorewall/start is that this one is invoked -# after delayed loading of the blacklist (DELAYBLACKLISTLOAD=Yes) and -# after the 'shorewall' chain has been created (thus signaling that the -# firewall is completely up). -# -# This script should not change the firewall configuration directly but -# may do so indirectly by running /sbin/shorewall with the 'nolock' -# option. +# This script should not change the firewall configuration directly but +# may do so indirectly by running /sbin/shorewall with the 'nolock' +# option. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. # ############################################################################### + |