summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-04-03 15:05:18 -0400
committerMicah Anderson <micah@riseup.net>2013-04-03 15:05:18 -0400
commit9e209455b5ca957fc8c939d1222ba3abf66f0595 (patch)
tree3890e9baa3a659bfd04938e3185dbacc4408fc62
parent38ce9a5950f1aadfb8b844c2ba4d280b06456489 (diff)
parent1e6fbdf7f1f7e381ef01170eab96727377abe3b6 (diff)
Merge branch 'parameterized_classes' into riseup
Conflicts: manifests/init.pp
-rw-r--r--manifests/init.pp6
1 files changed, 5 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index b2018a5..a176bf8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,7 +17,11 @@
# TODO: warn on cert/key issues, fail on false accept?
-class stunnel ( $ensure_version = 'present', $startboot = '1', $default_extra, $cluster = '' )
+class stunnel (
+ $ensure_version = 'present',
+ $startboot = '1',
+ $default_extra = '',
+ $cluster = '' )
{
case $::operatingsystem {