diff options
| author | mh <mh@immerda.ch> | 2010-01-30 17:09:34 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-01-30 17:09:34 +0100 |
| commit | 7aafb4dbfe33f19d0a2a82d5bab79d77deb27853 (patch) | |
| tree | 9140ab7df68e205dc92037d5180daead7d871242 /manifests/centos.pp | |
| parent | 42ca80476bcdb1da0e5e516d08a9b06ec32c6f26 (diff) | |
| parent | 550fa2b0a405e9bda6e2d82a1e423396a7ffdaa8 (diff) | |
merged with lavamind
Diffstat (limited to 'manifests/centos.pp')
| -rw-r--r-- | manifests/centos.pp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/manifests/centos.pp b/manifests/centos.pp index 23c8e3c..cb47adc 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -15,6 +15,9 @@ class apache::centos inherits apache::package { File[config_dir]{ path => "$config_dir/conf.d", } + File[include_dir]{ + path => "$config_dir/include.d", + } File[modules_dir]{ path => "$config_dir/modules.d", } @@ -25,19 +28,19 @@ class apache::centos inherits apache::package { path => '/var/www/html/index.html', } - file{'/etc/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'], - notify => Service['apache'], - owner => root, group => 0, mode => 0644; + file{'apache_service_config': + path => '/etc/sysconfig/httpd', + source => [ "puppet://$server/modules/site-apache/service/CentOS/${fqdn}/httpd", + "puppet://$server/modules/site-apache/service/CentOS/httpd", + "puppet://$server/modules/apache/service/CentOS/httpd" ], + require => Package['apache'], + notify => Service['apache'], + owner => root, group => 0, mode => 0644; } include apache::logrotate::centos - apache::config::file{ 'welcome.conf': } - apache::config::file{ 'vhosts.conf': } + apache::config::global{ 'welcome.conf': } + apache::config::global{ 'vhosts.conf': } } |