diff options
| author | intrigeri <intrigeri@boum.org> | 2010-10-17 04:45:09 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-10-17 04:45:09 +0200 |
| commit | f79bf97ec82e8adcf002ca6834b0df66f28e61f2 (patch) | |
| tree | 3b8258b0736051e1c641a58c06b96d716e0d4889 /manifests/init.pp | |
| parent | f9c1086afb6c343fe65e989413acb80cb7d5cb86 (diff) | |
| parent | c49625a4cd14a53d91b7d12aea88201a211a26a2 (diff) | |
| download | puppet-shorewall-f79bf97ec82e8adcf002ca6834b0df66f28e61f2.tar.gz puppet-shorewall-f79bf97ec82e8adcf002ca6834b0df66f28e61f2.tar.bz2 | |
Merge remote branch 'riseup/master'
Conflicts:
files/debian/default
manifests/init.pp
templates/debian/default
templates/debian_default.erb
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index e9ba464..3e759db 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,7 +15,7 @@ class shorewall { } default: { notice "unknown operatingsystem: $operatingsystem" - include shorewall::base + include shorewall::base } } @@ -49,4 +49,11 @@ class shorewall { shorewall::managed_file { routestopped: } # See http://www.shorewall.net/3.0/Documentation.htm#Variables shorewall::managed_file { params: } + # See http://www.shorewall.net/3.0/traffic_shaping.htm + shorewall::managed_file { tcdevices: } + # See http://www.shorewall.net/3.0/traffic_shaping.htm + shorewall::managed_file { tcrules: } + # See http://www.shorewall.net/3.0/traffic_shaping.htm + shorewall::managed_file { tcclasses: } + } |