diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-03 15:01:44 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-03 15:01:44 -0400 |
| commit | d7acd567ace308049848733d8f1c801b955974a8 (patch) | |
| tree | 2d96270a1c428b69f7839ab124064e3c9ebff3c0 | |
| parent | c3d3f81b98542b94a013440c81b0942c9c4a82cf (diff) | |
fix merge conflict error causing the $cluster parameter to go missing
| -rw-r--r-- | manifests/centos.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/centos.pp b/manifests/centos.pp index 39f18c7..19a4684 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -23,7 +23,7 @@ class stunnel::centos inherits stunnel::linux { file { '/etc/stunnel/stunnel.conf': source => [ "puppet:///modules/site-stunnel/${::fqdn}/stunnel.conf", - "puppet:///modules/site-stunnel/${stunnel_cluster}/stunnel.conf", + "puppet:///modules/site-stunnel/${stunnel::cluster}/stunnel.conf", 'puppet:///modules/site-stunnel/stunnel.conf', 'puppet:///modules/stunnel/${::operatingsystem}/stunnel.conf' ], require => Package['stunnel'], diff --git a/manifests/init.pp b/manifests/init.pp index a08fb0a..872e5f2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -17,7 +17,7 @@ # TODO: warn on cert/key issues, fail on false accept? -class stunnel ( $ensure_version = 'present', $startboot = '1', $default_extra = '' ) +class stunnel ( $ensure_version = 'present', $startboot = '1', $default_extra = '', $cluster = '' ) { case $::operatingsystem { |