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/centos | |
| parent | 4ff385d82bc0d300d501bf1fb41df8602c7c95a6 (diff) | |
fix various puppet language things
Diffstat (limited to 'manifests/centos')
| -rw-r--r-- | manifests/centos/itk.pp | 2 | ||||
| -rw-r--r-- | manifests/centos/itk_plus.pp | 4 | ||||
| -rw-r--r-- | manifests/centos/module.pp | 8 | ||||
| -rw-r--r-- | manifests/centos/worker.pp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/manifests/centos/itk.pp b/manifests/centos/itk.pp index 9e97fa0..20f4270 100644 --- a/manifests/centos/itk.pp +++ b/manifests/centos/itk.pp @@ -5,6 +5,6 @@ class apache::centos::itk inherits apache::centos { name => 'httpd-itk', } File['apache_service_config']{ - source => "puppet:///modules/apache/service/CentOS/httpd.itk" + source => "puppet:///modules/apache/service/${::operatingsystem}/httpd.itk" } } diff --git a/manifests/centos/itk_plus.pp b/manifests/centos/itk_plus.pp index bab2409..0df92c8 100644 --- a/manifests/centos/itk_plus.pp +++ b/manifests/centos/itk_plus.pp @@ -1,7 +1,7 @@ # http://hostby.net/home/2008/07/12/centos-5-and-mpm-itk/ class apache::centos::itk_plus inherits apache::centos::itk { Exec['adjust_pidfile']{ - command => "sed -i 's/^PidFile \(.*\)/#PidFile \1/g' /etc/httpd/conf/httpd.conf", + command => "sed -i 's/^PidFile \\(.*\\)/#PidFile \\1/g' /etc/httpd/conf/httpd.conf", unless => "grep -qE '^#PidFile ' /etc/httpd/conf/httpd.conf", } Exec['adjust_listen']{ @@ -11,7 +11,7 @@ class apache::centos::itk_plus inherits apache::centos::itk { Apache::Config::Global['00-listen.conf']{ ensure => 'present', - content => template("apache/itk_plus/${operatingsystem}/00-listen.conf.erb"), + content => template("apache/itk_plus/${::operatingsystem}/00-listen.conf.erb"), } File['apache_service_config']{ diff --git a/manifests/centos/module.pp b/manifests/centos/module.pp index 4e48b13..3220d1f 100644 --- a/manifests/centos/module.pp +++ b/manifests/centos/module.pp @@ -3,17 +3,17 @@ define apache::centos::module( $source = '', $destination = '' ){ - $modules_dir = "$apache::centos::config_dir/modules.d" + $modules_dir = "${apache::centos::config_dir}/modules.d" $real_destination = $destination ? { '' => "${modules_dir}/${name}.so", default => $destination, } $real_source = $source ? { '' => [ - "puppet:///modules/site_apache/modules.d/${fqdn}/${name}.so", - "puppet:///modules/site_apache/modules.d/${apache_cluster_node}/${name}.so", + "puppet:///modules/site_apache/modules.d/${::fqdn}/${name}.so", + "puppet:///modules/site_apache/modules.d/${apache::cluster_node}/${name}.so", "puppet:///modules/site_apache/modules.d/${name}.so", - "puppet:///modules/apache/modules.d/${operatingsystem}/${name}.so", + "puppet:///modules/apache/modules.d/${::operatingsystem}/${name}.so", "puppet:///modules/apache/modules.d/${name}.so" ], default => "puppet:///$source", diff --git a/manifests/centos/worker.pp b/manifests/centos/worker.pp index 4816fbf..f374bb7 100644 --- a/manifests/centos/worker.pp +++ b/manifests/centos/worker.pp @@ -1,5 +1,5 @@ class apache::centos::worker inherits apache::centos { File['apache_service_config']{ - source => "puppet:///modules/apache/service/CentOS/httpd.worker" + source => "puppet:///modules/apache/service/${::operatingsystem}/httpd.worker" } } |