diff options
Diffstat (limited to 'manifests/debian.pp')
| -rw-r--r-- | manifests/debian.pp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index b16dc9d..e07920f 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -3,7 +3,7 @@ class apache::debian inherits apache::package { $config_dir = '/etc/apache2' Package[apache] { - name => 'apache2', + name => 'apache2', } File[vhosts_dir] { path => "${config_dir}/sites-enabled", @@ -18,5 +18,22 @@ 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; + } + apache::config::global{ 'charset': } + apache::config::global{ 'security': } + file { 'default_debian_apache_vhost': + path => '/etc/apache2/sites-enabled/000-default', + ensure => absent, + } } |