diff options
| author | mh <mh@immerda.ch> | 2013-01-02 19:34:31 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2013-01-02 19:34:31 +0100 |
| commit | 58103ed409fc61d8e653babb73fcaf510969f3db (patch) | |
| tree | 0c022f3ff326248cc7194d3d1e5c768acfbcb399 /files | |
| parent | 2f388687ea30fdefdcd405807a0fce699807809d (diff) | |
| parent | faf6fba9579e285efd28f2ef96a7e3a5d4a5dd4b (diff) | |
Merge remote-tracking branch 'varac/master'
Conflicts:
files/boilerplate/providers.footer
files/boilerplate/providers.header
manifests/base.pp
manifests/providers.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 |
4 files changed, 11 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 |