summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2009-08-24 16:04:00 -0300
committerSilvio Rhatto <rhatto@riseup.net>2009-08-24 16:04:00 -0300
commit1c75011f2509264f5e0a4afbad811470d77099ae (patch)
tree707ec0fb119f93418f7c968b8e86731063d499ae
parenteda4f69cce2f2cd62f3288bdee9d8459c4673ce9 (diff)
downloadpuppet-shorewall-1c75011f2509264f5e0a4afbad811470d77099ae.tar.gz
puppet-shorewall-1c75011f2509264f5e0a4afbad811470d77099ae.tar.bz2
Changing default values for some traffic shapping defintions / updating changelog
-rw-r--r--manifests/init.pp5
1 files changed, 3 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 20093e9..c083dd0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,6 +7,7 @@
# at https://reductivelabs.com/trac/puppet/wiki/AqueosShorewall
#
# Changes:
+# * added support for traffic shapping: http://www.shorewall.net/traffic_shaping.htm
# * added extension_script define: http://shorewall.net/shorewall_extension_scripts.htm
# * FHS Layout: put configuration in /var/lib/puppet/modules/shorewall and
# adjust CONFIG_PATH
@@ -204,7 +205,7 @@ class shorewall {
# See http://www.shorewall.net/3.0/traffic_shaping.htm
managed_file { tcdevices: }
- define tcdevices($in_bandwidth, $out_bandwidth, $options = '-', $redirected_interfaces = '', $order='100'){
+ define tcdevices($in_bandwidth, $out_bandwidth, $options = '', $redirected_interfaces = '', $order='100'){
entry { "tcdevices.d/${order}-${title}":
line => "${name} ${in_bandwidth} ${out_bandwidth} ${options} ${redirected_interfaces}",
}
@@ -212,7 +213,7 @@ class shorewall {
# See http://www.shorewall.net/3.0/traffic_shaping.htm
managed_file { tcrules: }
- define tcrules($source, $destination, $protocol = 'all', $ports, $client_ports = '-', $order='1'){
+ define tcrules($source, $destination, $protocol = 'all', $ports, $client_ports = '', $order='1'){
entry { "tcrules.d/${order}-${title}":
line => "# ${name}\n${order} ${source} ${destination} ${protocol} ${ports} ${client_ports}",
}