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/itk.pp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'manifests/centos') diff --git a/manifests/centos/itk.pp b/manifests/centos/itk.pp index 98939c2..94f0f1c 100644 --- a/manifests/centos/itk.pp +++ b/manifests/centos/itk.pp @@ -4,10 +4,9 @@ class apache::centos::itk inherits apache::centos { Package['apache']{ name => 'httpd-itk', } - File['/etc/sysconfig/httpd']{ - 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" ], + File['apache_service_config']{ + source => [ "puppet://$server/modules/site-apache/service/CentOS/${fqdn}/httpd.itk", + "puppet://$server/modules/site-apache/service/CentOS/httpd.itk", + "puppet://$server/modules/apache/service/CentOS/httpd.itk" ], } } -- cgit v1.2.3