Updates debian default config

diff --git a/templates/debian_default.erb b/templates/debian_default.erb
index ec64cbe0e36a67719c5dc38b29e0fa3d44286d78..520c499329b38fb6eca69976d76458633ab7d0c4 100644 (file)
--- a/templates/debian_default.erb
+++ b/templates/debian_default.erb
@@ -1,14 +1,14 @@
 # prevent startup with default configuration
-# set the following varible to 1 in order to allow Shorewall to start
+# set the following variable to 1 in order to allow Shorewall to start
 
 # This file is brought to you by puppet
 
 startup=<%= scope.lookupvar('shorewall::startup') == "0" ? '0' : '1' %>
 
-# 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.
+# 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"
@@ -18,9 +18,39 @@ startup=<%= scope.lookupvar('shorewall::startup') == "0" ? '0' : '1' %>
 #    wait_interface=
 
 #
-# Startup options
+# 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