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/rfc1918.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/rfc1918.pp')
| -rw-r--r-- | manifests/rfc1918.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/rfc1918.pp b/manifests/rfc1918.pp index 6c2719c..527c8d0 100644 --- a/manifests/rfc1918.pp +++ b/manifests/rfc1918.pp @@ -2,7 +2,7 @@ define shorewall::rfc1918( $action = 'logdrop', $order='100' ){ - shorewall::entry{"rfc1918.d/${order}-${name}": + shorewall::entry{"rfc1918.d/${order}-${title}": line => "${name} ${action}" } } |