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.pp | |
| parent | 57da0ebe11e5b6f99dc96c13845e4b3205442df1 (diff) | |
update apache module to 0.25.x style
Diffstat (limited to 'manifests/centos.pp')
| -rw-r--r-- | manifests/centos.pp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/manifests/centos.pp b/manifests/centos.pp index 4755af8..23c8e3c 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -1,6 +1,6 @@ ### centos class apache::centos inherits apache::package { - $config_dir = '/etc/httpd/' + $config_dir = '/etc/httpd' Package[apache]{ name => 'httpd', @@ -10,13 +10,13 @@ class apache::centos inherits apache::package { restart => '/etc/init.d/httpd graceful', } File[vhosts_dir]{ - path => "$config_dir/vhosts.d/", + path => "$config_dir/vhosts.d", } File[config_dir]{ - path => "$config_dir/conf.d/", + path => "$config_dir/conf.d", } File[modules_dir]{ - path => "$config_dir/modules.d/", + path => "$config_dir/modules.d", } File[web_dir]{ path => "/var/www/vhosts", @@ -26,8 +26,8 @@ class apache::centos inherits apache::package { } file{'/etc/sysconfig/httpd': - source => [ "puppet://$server/files/apache/sysconfig/${fqdn}/httpd", - "puppet://$server/files/apache/sysconfig/httpd", + source => [ "puppet://$server/modules/site-apache/sysconfig/${fqdn}/httpd", + "puppet://$server/modules/site-apache/sysconfig/httpd", "puppet://$server/modules/apache/sysconfig/${operatingsystem}/httpd", "puppet://$server/modules/apache/sysconfig/httpd" ], require => Package['apache'], |