diff options
| author | mh <mh@immerda.ch> | 2012-05-31 11:38:45 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-05-31 11:38:45 +0200 |
| commit | 076909377eaa3aa41936e3acb7e02a9b5b14d493 (patch) | |
| tree | dae4bd4d405ffe1ba75ea1d50763bfbecf9e1a19 /manifests/ssl | |
| parent | 4ff385d82bc0d300d501bf1fb41df8602c7c95a6 (diff) | |
fix various puppet language things
Diffstat (limited to 'manifests/ssl')
| -rw-r--r-- | manifests/ssl/itk.pp | 2 | ||||
| -rw-r--r-- | manifests/ssl/itk_plus.pp | 2 | ||||
| -rw-r--r-- | manifests/ssl/itk_plus/centos.pp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/manifests/ssl/itk.pp b/manifests/ssl/itk.pp index 62c96cf..5fd3aaf 100644 --- a/manifests/ssl/itk.pp +++ b/manifests/ssl/itk.pp @@ -1,7 +1,7 @@ # manifests/ssl/itk.pp class apache::ssl::itk inherits apache::ssl { - case $operatingsystem { + case $::operatingsystem { centos: { include apache::ssl::itk::centos } } } diff --git a/manifests/ssl/itk_plus.pp b/manifests/ssl/itk_plus.pp index 5c2d202..0c8e667 100644 --- a/manifests/ssl/itk_plus.pp +++ b/manifests/ssl/itk_plus.pp @@ -1,5 +1,5 @@ class apache::ssl::itk_plus inherits apache::ssl::itk { - case $operatingsystem { + case $::operatingsystem { centos: { include ::apache::ssl::itk_plus::centos } default: { fail("itk plus mode is currently only implemented for CentOS") } } diff --git a/manifests/ssl/itk_plus/centos.pp b/manifests/ssl/itk_plus/centos.pp index d76c927..00fb472 100644 --- a/manifests/ssl/itk_plus/centos.pp +++ b/manifests/ssl/itk_plus/centos.pp @@ -1,11 +1,11 @@ class apache::ssl::itk_plus::centos inherits apache::ssl::centos { include apache::ssl::itk::centos Apache::Config::Global['ssl.conf']{ - source => "modules/apache/itk_plus/conf.d/${operatingsystem}/ssl.conf", + source => "modules/apache/itk_plus/conf.d/${::operatingsystem}/ssl.conf", } Apache::Config::Global['00-listen-ssl.conf']{ ensure => 'present', - content => template("apache/itk_plus/${operatingsystem}/00-listen-ssl.conf.erb"), + content => template("apache/itk_plus/${::operatingsystem}/00-listen-ssl.conf.erb"), } } |