diff options
| author | Micah Anderson <micah@riseup.net> | 2013-01-24 16:11:31 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-01-24 16:11:31 -0500 |
| commit | 614ee152c39bbc66c82a52022e2c05aa7856cd4b (patch) | |
| tree | 117fc0f3f61b4362be5dc1f32ab30db445efceb1 /files | |
| parent | d3d58a60bb582875a63e78245fb697d18a10877e (diff) | |
| parent | 9e79c7c55755e4cff5097d34c14396fdb0f15f85 (diff) | |
Merge remote-tracking branch 'riseup/master'
Conflicts:
manifests/base.pp
Diffstat (limited to 'files')
| -rw-r--r-- | files/boilerplate/providers.footer | 2 | ||||
| -rw-r--r-- | files/boilerplate/providers.header | 2 | ||||
| -rw-r--r-- | files/boilerplate/rtrules.footer | 1 | ||||
| -rw-r--r-- | files/boilerplate/rtrules.header | 8 | ||||
| -rw-r--r-- | files/boilerplate/tunnel.footer | 1 | ||||
| -rw-r--r-- | files/boilerplate/tunnel.header | 11 |
6 files changed, 23 insertions, 2 deletions
diff --git a/files/boilerplate/providers.footer b/files/boilerplate/providers.footer index 6bebc05..5e12d1d 100644 --- a/files/boilerplate/providers.footer +++ b/files/boilerplate/providers.footer @@ -1 +1 @@ -#LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE +#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/files/boilerplate/providers.header b/files/boilerplate/providers.header index c5fb1c5..b4a5990 100644 --- a/files/boilerplate/providers.header +++ b/files/boilerplate/providers.header @@ -6,4 +6,4 @@ # For additional information, see http://shorewall.net/MultiISP.html # ############################################################################################ -#NAME NUMBER MARK DUPLICATE INTERFACE GATEWAY OPTIONS COPY +#NAME NUMBER MARK DUPLICATE INTERFACE GATEWAY OPTIONS COPY diff --git a/files/boilerplate/rtrules.footer b/files/boilerplate/rtrules.footer new file mode 100644 index 0000000..5e12d1d --- /dev/null +++ b/files/boilerplate/rtrules.footer @@ -0,0 +1 @@ +#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/files/boilerplate/rtrules.header b/files/boilerplate/rtrules.header new file mode 100644 index 0000000..fd9b2f4 --- /dev/null +++ b/files/boilerplate/rtrules.header @@ -0,0 +1,8 @@ +# +# Shorewall version 4 - route rules File +# +# For information about entries in this file, type "man shorewall-rtrules" +# +# For additional information, see http://www.shorewall.net/MultiISP.html +#################################################################################### +# SOURCE DEST PROVIDER PRIORITY MASK diff --git a/files/boilerplate/tunnel.footer b/files/boilerplate/tunnel.footer new file mode 100644 index 0000000..5e12d1d --- /dev/null +++ b/files/boilerplate/tunnel.footer @@ -0,0 +1 @@ +#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/files/boilerplate/tunnel.header b/files/boilerplate/tunnel.header new file mode 100644 index 0000000..638fd56 --- /dev/null +++ b/files/boilerplate/tunnel.header @@ -0,0 +1,11 @@ +# +# Shorewall version 4 - Tunnels File +# +# For information about entries in this file, type "man shorewall-tunnels" +# +# The manpage is also online at +# http://www.shorewall.net/manpages/shorewall-tunnels.html +# +############################################################################### +#TYPE ZONE GATEWAY GATEWAY +# ZONE |