aboutsummaryrefslogtreecommitdiff
path: root/manifests/interface.pp
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-10-17 04:45:09 +0200
committerintrigeri <intrigeri@boum.org>2010-10-17 04:45:09 +0200
commitf79bf97ec82e8adcf002ca6834b0df66f28e61f2 (patch)
tree3b8258b0736051e1c641a58c06b96d716e0d4889 /manifests/interface.pp
parentf9c1086afb6c343fe65e989413acb80cb7d5cb86 (diff)
parentc49625a4cd14a53d91b7d12aea88201a211a26a2 (diff)
downloadpuppet-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/interface.pp')
-rw-r--r--manifests/interface.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/interface.pp b/manifests/interface.pp
index 1cb5042..56b6db4 100644
--- a/manifests/interface.pp
+++ b/manifests/interface.pp
@@ -20,7 +20,7 @@ define shorewall::interface(
}
}
- shorewall::entry { "interfaces.d/${order}-${name}":
+ shorewall::entry { "interfaces.d/${order}-${title}":
line => "${zone} ${name} ${broadcast} ${options_real}",
}
}