summaryrefslogtreecommitdiff
path: root/manifests/debian.pp
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/debian.pp
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/debian.pp')
-rw-r--r--manifests/debian.pp11
1 files changed, 11 insertions, 0 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp
index 54302ae..ab19a1e 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -18,6 +18,17 @@ class apache::debian inherits apache::package {
File[default_apache_index] {
path => '/var/www/index.html',
}
+ file { 'apache_main_config':
+ path => "${config_dir}/apache2.conf",
+ source => [ "puppet://$server/modules/site-apache/config/Debian.${lsbdistcodename}/${fqdn}/apache2.conf",
+ "puppet://$server/modules/site-apache/config/Debian/{$fqdn}/apache2.conf",
+ "puppet://$server/modules/site-apache/config/Debian.${lsbdistcodename}/apache2.conf",
+ "puppet://$server/modules/site-apache/config/Debian/apache2.conf",
+ "puppet://$server/modules/apache/config/Debian/apache2.conf" ],
+ require => Package['apache'],
+ notify => Service['apache'],
+ owner => root, group => 0, mode => 0644;
+ }
file { 'default_debian_apache_vhost':
path => '/etc/apache2/sites-enabled/000-default',
ensure => absent,