Merge remote-tracking branch 'leap/parameterized_classes'
authorvarac <varacanero@zeromail.org>
Fri, 14 Jun 2013 17:47:07 +0000 (19:47 +0200)
committervarac <varacanero@zeromail.org>
Fri, 14 Jun 2013 17:47:07 +0000 (19:47 +0200)
Conflicts:
manifests/init.pp

1  2 
manifests/centos.pp

@@@ -23,9 -23,9 +23,9 @@@ class stunnel::centos inherits stunnel:
  
    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' ],
 +                 "puppet:///modules/stunnel/${::operatingsystem}/stunnel.conf" ],
      require => Package['stunnel'],
      notify  => Service['stunnel'],
      owner   => root,