From c4649cd122eb73c9dfb5498436abb636174d1180 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 23 Dec 2009 16:40:33 -0500 Subject: organize files in subdirectories per type : 'config' for main apache config; 'scripts' for extra shell scripts; 'service' for service default parameters. also, manage apache2.conf on Debian. --- manifests/centos.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'manifests/centos.pp') diff --git a/manifests/centos.pp b/manifests/centos.pp index 4446114..74a34f5 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -25,14 +25,14 @@ 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 -- cgit v1.2.3