diff options
| author | intrigeri <intrigeri@boum.org> | 2012-11-11 23:10:20 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2012-11-11 23:10:20 +0100 |
| commit | 8080f1a892a69dc171187c8165d7e81f5b5b512d (patch) | |
| tree | 6e610ec18aaa13f7797eedd08b03c852e49d8cfb /manifests/tcdevices.pp | |
| parent | 911cc18e594bb5a3ab642ebb24615a0447050c32 (diff) | |
| parent | 5052233d92e97263eab292408ed2602db0836d98 (diff) | |
| download | puppet-shorewall-8080f1a892a69dc171187c8165d7e81f5b5b512d.tar.gz puppet-shorewall-8080f1a892a69dc171187c8165d7e81f5b5b512d.tar.bz2 | |
Merge remote-tracking branch 'riseup/master' into tmp
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests/tcdevices.pp')
| -rw-r--r-- | manifests/tcdevices.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/tcdevices.pp b/manifests/tcdevices.pp index 54c9665..f4e88d8 100644 --- a/manifests/tcdevices.pp +++ b/manifests/tcdevices.pp @@ -5,7 +5,7 @@ define shorewall::tcdevices( $redirected_interfaces = '', $order = '100' ){ - shorewall::entry { "tcdevices.d/${order}-${title}": + shorewall::entry { "tcdevices-${order}-${name}": line => "${name} ${in_bandwidth} ${out_bandwidth} ${options} ${redirected_interfaces}", } } |