diff options
| author | mh <mh@immerda.ch> | 2009-11-14 14:34:05 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-11-14 14:34:05 +0100 |
| commit | 1b2310bab053cd40616e9740f9d38ef8826b3764 (patch) | |
| tree | c3567eb47a1704cf709aa4341c8c5debb966a53b /manifests/centos | |
| parent | 57da0ebe11e5b6f99dc96c13845e4b3205442df1 (diff) | |
update apache module to 0.25.x style
Diffstat (limited to 'manifests/centos')
| -rw-r--r-- | manifests/centos/itk.pp | 4 | ||||
| -rw-r--r-- | manifests/centos/module.pp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/manifests/centos/itk.pp b/manifests/centos/itk.pp index f944a53..98939c2 100644 --- a/manifests/centos/itk.pp +++ b/manifests/centos/itk.pp @@ -5,8 +5,8 @@ class apache::centos::itk inherits apache::centos { name => 'httpd-itk', } File['/etc/sysconfig/httpd']{ - source => [ "puppet://$server/files/apache/sysconfig/${fqdn}/httpd.itk", - "puppet://$server/files/apache/sysconfig/httpd.itk", + source => [ "puppet://$server/modules/site-apache/sysconfig/${fqdn}/httpd.itk", + "puppet://$server/modules/site-apache/sysconfig/httpd.itk", "puppet://$server/modules/apache/sysconfig/${operatingsystem}/httpd.itk", "puppet://$server/modules/apache/sysconfig/httpd.itk" ], } diff --git a/manifests/centos/module.pp b/manifests/centos/module.pp index b5b0d08..4bbf251 100644 --- a/manifests/centos/module.pp +++ b/manifests/centos/module.pp @@ -3,16 +3,16 @@ 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://$server/files/apache/modules.d/${fqdn}/${name}.so", - "puppet://$server/files/apache/modules.d/${apache_cluster_node}/${name}.so", - "puppet://$server/files/apache/modules.d/${name}.so", + "puppet://$server/modules/site-apache/modules.d/${fqdn}/${name}.so", + "puppet://$server/modules/site-apache/modules.d/${apache_cluster_node}/${name}.so", + "puppet://$server/modules/site-apache/modules.d/${name}.so", "puppet://$server/modules/apache/modules.d/${operatingsystem}/${name}.so", "puppet://$server/modules/apache/modules.d/${name}.so" ], |