Signed-off-by: Matt Darfeuille <[email protected]>
---
 Shorewall-core/shorewallrc.debian.sysvinit |  2 +-
 Shorewall-lite/default.debian              | 44 ------------------------
 Shorewall-lite/default.debian.sysvinit     | 54 ++++++++++++++++++++++++++++++
 Shorewall/default.debian                   | 49 ---------------------------
 Shorewall/default.debian.sysvinit          | 54 ++++++++++++++++++++++++++++++
 Shorewall6-lite/default.debian             | 44 ------------------------
 Shorewall6-lite/default.debian.sysvinit    | 54 ++++++++++++++++++++++++++++++
 Shorewall6/default.debian                  | 44 ------------------------
 Shorewall6/default.debian.sysvinit         | 54 ++++++++++++++++++++++++++++++
 9 files changed, 217 insertions(+), 182 deletions(-)
 delete mode 100644 Shorewall-lite/default.debian
 create mode 100644 Shorewall-lite/default.debian.sysvinit
 delete mode 100644 Shorewall/default.debian
 create mode 100644 Shorewall/default.debian.sysvinit
 delete mode 100644 Shorewall6-lite/default.debian
 create mode 100644 Shorewall6-lite/default.debian.sysvinit
 delete mode 100644 Shorewall6/default.debian
 create mode 100644 Shorewall6/default.debian.sysvinit

diff --git a/Shorewall-core/shorewallrc.debian.sysvinit 
b/Shorewall-core/shorewallrc.debian.sysvinit
index 9396e9f..4c555a8 100644
--- a/Shorewall-core/shorewallrc.debian.sysvinit
+++ b/Shorewall-core/shorewallrc.debian.sysvinit
@@ -14,7 +14,7 @@ INITDIR=/etc/init.d                     #Directory where SysV 
init scripts are i
 INITFILE=$PRODUCT                       #Name of the product's installed SysV 
init script
 INITSOURCE=init.debian.sh               #Name of the distributed file to be 
installed as the SysV init script
 ANNOTATED=                              #If non-zero, annotated configuration 
files are installed
-SYSCONFFILE=default.debian              #Name of the distributed file to be 
installed in $SYSCONFDIR
+SYSCONFFILE=default.debian.sysvinit              #Name of the distributed file 
to be installed in $SYSCONFDIR
 SERVICEFILE=                           #Name of the file to install in 
$SYSTEMD. Default is $PRODUCT.service
 SYSCONFDIR=/etc/default                 #Directory where SysV init parameter 
files are installed
 SERVICEDIR=                            #Directory where .service files are 
installed (systems running systemd only)
diff --git a/Shorewall-lite/default.debian b/Shorewall-lite/default.debian
deleted file mode 100644
index 9e81334..0000000
--- a/Shorewall-lite/default.debian
+++ /dev/null
@@ -1,44 +0,0 @@
-# prevent startup with default configuration
-# set the following variable to 1 in order to allow Shorewall-lite to start
-
-startup=0
-
-# If your Shorewall-lite configuration requires detection of the ip address of
-# a ppp interface, you must list such interfaces in "wait_interface" to get
-# Shorewall-lite to wait until the interface is configured. Otherwise the
-# script will fail because it won't be able to detect the IP address.
-#
-# Example:
-#    wait_interface="ppp0"
-# or
-#    wait_interface="ppp0 ppp1"
-# or, if you have defined  in /etc/shorewall-lite/params
-#    wait_interface=
-
-#
-# Startup options
-#
-OPTIONS=""
-
-#
-# Start options
-#
-STARTOPTIONS=""
-
-#
-# Restart options
-#
-RESTARTOPTIONS=""
-
-#
-# Init Log -- if /dev/null, use the STARTUP_LOG defined in shorewall.conf
-#
-INITLOG=/dev/null
-
-#
-# Set this to 1 to cause '/etc/init.d/shorewall-lite stop' to place the 
firewall in
-# a safe state rather than to open it
-#
-SAFESTOP=0
-
-# EOF
diff --git a/Shorewall-lite/default.debian.sysvinit 
b/Shorewall-lite/default.debian.sysvinit
new file mode 100644
index 0000000..41bdbee
--- /dev/null
+++ b/Shorewall-lite/default.debian.sysvinit
@@ -0,0 +1,54 @@
+# prevent startup with default configuration
+# set the following variable to 1 in order to allow Shorewall-lite to start
+
+startup=0
+
+# If your Shorewall-lite configuration requires detection of the ip address of
+# a ppp interface, you must list such interfaces in "wait_interface" to get
+# Shorewall-lite to wait until the interface is configured. Otherwise the
+# script will fail because it won't be able to detect the IP address.
+#
+# Example:
+#    wait_interface="ppp0"
+# or
+#    wait_interface="ppp0 ppp1"
+# or, if you have defined  in /etc/shorewall-lite/params
+#    wait_interface=
+
+#
+# Global start/restart/reload/stop options
+#
+OPTIONS=""
+
+#
+# Start options
+#
+STARTOPTIONS=""
+
+#
+# Restart options
+#
+RESTARTOPTIONS=""
+
+#
+# Reload options
+#
+RELOADOPTIONS=""
+
+#
+# Stop options
+#
+STOPOPTIONS=""
+
+#
+# Init Log -- if /dev/null, use the STARTUP_LOG defined in shorewall.conf
+#
+INITLOG=/dev/null
+
+#
+# Set this to 1 to cause '/etc/init.d/shorewall-lite stop' to place the 
firewall in
+# a safe state rather than to open it
+#
+SAFESTOP=0
+
+# EOF
diff --git a/Shorewall/default.debian b/Shorewall/default.debian
deleted file mode 100644
index bae91c0..0000000
--- a/Shorewall/default.debian
+++ /dev/null
@@ -1,49 +0,0 @@
-# prevent startup with default configuration
-# set the following variable to 1 in order to allow Shorewall to start
-
-startup=0
-
-# If your Shorewall configuration requires detection of the ip address of a ppp
-# interface, you must list such interfaces in "wait_interface" to get Shorewall
-# to wait until the interface is configured. Otherwise the script will fail
-# because it won't be able to detect the IP address.
-#
-# Example:
-#    wait_interface="ppp0"
-# or
-#    wait_interface="ppp0 ppp1"
-# or, if you have defined  in /etc/shorewall/params
-#    wait_interface=
-
-#
-# Global start/restart options
-#
-OPTIONS=""
-
-#
-# Start options
-#
-STARTOPTIONS=""
-
-#
-# Restart options
-#
-RELOADOPTIONS=""
-
-#
-# Restart options
-#
-RESTARTOPTIONS=""
-
-#
-# Init Log -- if /dev/null, use the STARTUP_LOG defined in shorewall.conf
-#
-INITLOG=/dev/null
-
-#
-# Set this to 1 to cause '/etc/init.d/shorewall stop' to place the firewall in
-# a safe state rather than to open it
-#
-SAFESTOP=0
-
-# EOF
diff --git a/Shorewall/default.debian.sysvinit 
b/Shorewall/default.debian.sysvinit
new file mode 100644
index 0000000..6740415
--- /dev/null
+++ b/Shorewall/default.debian.sysvinit
@@ -0,0 +1,54 @@
+# prevent startup with default configuration
+# set the following variable to 1 in order to allow Shorewall to start
+
+startup=0
+
+# If your Shorewall configuration requires detection of the ip address of a ppp
+# interface, you must list such interfaces in "wait_interface" to get Shorewall
+# to wait until the interface is configured. Otherwise the script will fail
+# because it won't be able to detect the IP address.
+#
+# Example:
+#    wait_interface="ppp0"
+# or
+#    wait_interface="ppp0 ppp1"
+# or, if you have defined  in /etc/shorewall/params
+#    wait_interface=
+
+#
+# Global start/restart/reload/stop options
+#
+OPTIONS=""
+
+#
+# Start options
+#
+STARTOPTIONS=""
+
+#
+# Restart options
+#
+RESTARTOPTIONS=""
+
+#
+# Reload options
+#
+RELOADOPTIONS=""
+
+#
+# Stop options
+#
+STOPOPTIONS=""
+
+#
+# Init Log -- if /dev/null, use the STARTUP_LOG defined in shorewall.conf
+#
+INITLOG=/dev/null
+
+#
+# Set this to 1 to cause '/etc/init.d/shorewall stop' to place the firewall in
+# a safe state rather than to open it
+#
+SAFESTOP=0
+
+# EOF
diff --git a/Shorewall6-lite/default.debian b/Shorewall6-lite/default.debian
deleted file mode 100644
index 0af3be7..0000000
--- a/Shorewall6-lite/default.debian
+++ /dev/null
@@ -1,44 +0,0 @@
-# prevent startup with default configuration
-# set the following variable to 1 in order to allow Shorewall6-lite to start
-
-startup=0
-
-# If your Shorewall6-lite configuration requires detection of the ip address of
-# a ppp interface, you must list such interfaces in "wait_interface" to get
-# Shorewall6-lite to wait until the interface is configured. Otherwise the
-# script will fail because it won't be able to detect the IP address.
-#
-# Example:
-#    wait_interface="ppp0"
-# or
-#    wait_interface="ppp0 ppp1"
-# or, if you have defined  in /etc/shorewall6-lite/params
-#    wait_interface=
-
-#
-# Startup options
-#
-OPTIONS=""
-
-#
-# Start options
-#
-STARTOPTIONS=""
-
-#
-# Restart options
-#
-RESTARTOPTIONS=""
-
-#
-# Init Log -- if /dev/null, use the STARTUP_LOG defined in shorewall.conf
-#
-INITLOG=/dev/null
-
-#
-# Set this to 1 to cause '/etc/init.d/shorewall6-lite stop' to place the 
firewall in
-# a safe state rather than to open it
-#
-SAFESTOP=0
-
-# EOF
diff --git a/Shorewall6-lite/default.debian.sysvinit 
b/Shorewall6-lite/default.debian.sysvinit
new file mode 100644
index 0000000..302e5da
--- /dev/null
+++ b/Shorewall6-lite/default.debian.sysvinit
@@ -0,0 +1,54 @@
+# prevent startup with default configuration
+# set the following variable to 1 in order to allow Shorewall6-lite to start
+
+startup=0
+
+# If your Shorewall6-lite configuration requires detection of the ip address of
+# a ppp interface, you must list such interfaces in "wait_interface" to get
+# Shorewall6-lite to wait until the interface is configured. Otherwise the
+# script will fail because it won't be able to detect the IP address.
+#
+# Example:
+#    wait_interface="ppp0"
+# or
+#    wait_interface="ppp0 ppp1"
+# or, if you have defined  in /etc/shorewall6-lite/params
+#    wait_interface=
+
+#
+# Global start/restart/reload/stop options
+#
+OPTIONS=""
+
+#
+# Start options
+#
+STARTOPTIONS=""
+
+#
+# Restart options
+#
+RESTARTOPTIONS=""
+
+#
+# Reload options
+#
+RELOADOPTIONS=""
+
+#
+# Stop options
+#
+STOPOPTIONS=""
+
+#
+# Init Log -- if /dev/null, use the STARTUP_LOG defined in shorewall.conf
+#
+INITLOG=/dev/null
+
+#
+# Set this to 1 to cause '/etc/init.d/shorewall6-lite stop' to place the 
firewall in
+# a safe state rather than to open it
+#
+SAFESTOP=0
+
+# EOF
diff --git a/Shorewall6/default.debian b/Shorewall6/default.debian
deleted file mode 100644
index 42ec51f..0000000
--- a/Shorewall6/default.debian
+++ /dev/null
@@ -1,44 +0,0 @@
-# prevent startup with default configuration
-# set the following variable to 1 in order to allow Shorewall6 to start
-
-startup=0
-
-# if your Shorewall6 configuration requires detection of the ip address of a
-# ppp interface, you must list such interfaces in "wait_interface" to get
-# Shorewall6 to wait until the interface is configured. Otherwise the script
-# will fail because it won't be able to detect the IP address.
-#
-# Example:
-#    wait_interface="ppp0"
-# or
-#    wait_interface="ppp0 ppp1"
-# or, if you have defined  in /etc/shorewall6/params
-#    wait_interface=
-
-#
-# Startup options
-#
-OPTIONS=""
-
-#
-# Start options
-#
-STARTOPTIONS=""
-
-#
-# Restart options
-#
-RESTARTOPTIONS=""
-
-#
-# Init Log -- if /dev/null, use the STARTUP_LOG defined in shorewall.conf
-#
-INITLOG=/dev/null
-
-#
-# Set this to 1 to cause '/etc/init.d/shorewall6 stop' to place the firewall in
-# a safe state rather than to open it
-#
-SAFESTOP=0
-
-# EOF
diff --git a/Shorewall6/default.debian.sysvinit 
b/Shorewall6/default.debian.sysvinit
new file mode 100644
index 0000000..3959b94
--- /dev/null
+++ b/Shorewall6/default.debian.sysvinit
@@ -0,0 +1,54 @@
+# prevent startup with default configuration
+# set the following variable to 1 in order to allow Shorewall6 to start
+
+startup=0
+
+# if your Shorewall6 configuration requires detection of the ip address of a
+# ppp interface, you must list such interfaces in "wait_interface" to get
+# Shorewall6 to wait until the interface is configured. Otherwise the script
+# will fail because it won't be able to detect the IP address.
+#
+# Example:
+#    wait_interface="ppp0"
+# or
+#    wait_interface="ppp0 ppp1"
+# or, if you have defined  in /etc/shorewall6/params
+#    wait_interface=
+
+#
+# Global start/restart/reload/stop options
+#
+OPTIONS=""
+
+#
+# Start options
+#
+STARTOPTIONS=""
+
+#
+# Restart options
+#
+RESTARTOPTIONS=""
+
+#
+# Reload options
+#
+RELOADOPTIONS=""
+
+#
+# Stop options
+#
+STOPOPTIONS=""
+
+#
+# Init Log -- if /dev/null, use the STARTUP_LOG defined in shorewall.conf
+#
+INITLOG=/dev/null
+
+#
+# Set this to 1 to cause '/etc/init.d/shorewall6 stop' to place the firewall in
+# a safe state rather than to open it
+#
+SAFESTOP=0
+
+# EOF
-- 
2.8.3


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel

Reply via email to