diff options
| author | varac <varacanero@zeromail.org> | 2012-11-04 21:30:21 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-11-04 21:30:21 +0100 |
| commit | 104b2e09399e02a8aa9687df0de795644e4b83e0 (patch) | |
| tree | 61fe2d2db488a11b074eb7c65370edb8be23988a /manifests | |
| parent | 9eea95a38b9c03d9d769de2f9cc2e2820e3d4cb3 (diff) | |
added paths so wheez config is picked up, also linted a bit
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/debian.pp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index e07920f..b7a5d9e 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", @@ -12,28 +12,31 @@ class apache::debian inherits apache::package { path => "${config_dir}/mods-enabled", } File[htpasswd_dir] { - path => "/var/www/htpasswds", - group => 'www-data', + path => '/var/www/htpasswds', + group => 'www-data', } 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", + 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.${lsbdistcodename}/${fqdn}/apache2.conf", + "puppet://$server/modules/apache/config/Debian/{$fqdn}/apache2.conf", + "puppet://$server/modules/apache/config/Debian.${lsbdistcodename}/apache2.conf", "puppet://$server/modules/apache/config/Debian/apache2.conf" ], require => Package['apache'], - notify => Service['apache'], - owner => root, group => 0, mode => 0644; + 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, + path => '/etc/apache2/sites-enabled/000-default', } } |