summaryrefslogtreecommitdiff
path: root/manifests/centos
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2009-12-23 16:40:33 -0500
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2009-12-23 16:40:33 -0500
commitc4649cd122eb73c9dfb5498436abb636174d1180 (patch)
tree8fc6e5c841be5d51bdd3635d4ced74817c96789c /manifests/centos
parentd2c4bdf792815f0a0f54d717bdec619f03d984ab (diff)
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.
Diffstat (limited to 'manifests/centos')
-rw-r--r--manifests/centos/itk.pp9
1 files changed, 4 insertions, 5 deletions
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" ],
}
}