aboutsummaryrefslogtreecommitdiff
path: root/files/boilerplate
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-06-20 11:46:58 -0400
committerMicah Anderson <micah@riseup.net>2012-06-20 11:46:58 -0400
commit58543cc4d02f9c47bec3c0d16561d53682881843 (patch)
treefaa78a536a84c5478cec31305826c9c0d04a6c4a /files/boilerplate
parent6cb88973f53aa7d92414797dd21952c1c1d5da98 (diff)
parentbe37ed29e196008209431f1401c040dd200e3019 (diff)
downloadpuppet-shorewall-58543cc4d02f9c47bec3c0d16561d53682881843.tar.gz
puppet-shorewall-58543cc4d02f9c47bec3c0d16561d53682881843.tar.bz2
Merge remote-tracking branch 'immerda/master' into riseup
NOTE: the conflicts in the files/shorewall.conf.Debian.squeeze I resolved by favoring the actual debian squeeze shorewall.conf, there were a few options in the immerda one that were not the same. Conflicts: README files/shorewall.conf.Debian.squeeze manifests/base.pp manifests/blacklist.pp manifests/debian.pp manifests/host.pp manifests/init.pp manifests/interface.pp manifests/masq.pp manifests/nat.pp manifests/params.pp manifests/policy.pp manifests/proxyarp.pp manifests/rfc1918.pp manifests/routestopped.pp manifests/rule.pp manifests/rule_section.pp manifests/rules/out/ekeyd.pp manifests/zone.pp
Diffstat (limited to 'files/boilerplate')
-rw-r--r--files/boilerplate/providers.footer1
-rw-r--r--files/boilerplate/providers.header9
2 files changed, 10 insertions, 0 deletions
diff --git a/files/boilerplate/providers.footer b/files/boilerplate/providers.footer
new file mode 100644
index 0000000..6bebc05
--- /dev/null
+++ b/files/boilerplate/providers.footer
@@ -0,0 +1 @@
+#LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE
diff --git a/files/boilerplate/providers.header b/files/boilerplate/providers.header
new file mode 100644
index 0000000..c5fb1c5
--- /dev/null
+++ b/files/boilerplate/providers.header
@@ -0,0 +1,9 @@
+#
+# Shorewall version 4 - Providers File
+#
+# For information about entries in this file, type "man shorewall-providers"
+#
+# For additional information, see http://shorewall.net/MultiISP.html
+#
+############################################################################################
+#NAME NUMBER MARK DUPLICATE INTERFACE GATEWAY OPTIONS COPY