diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-25 12:44:38 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-25 12:44:38 -0400 |
| commit | 59e7fcc6debe8a161114720fa4392221252ad998 (patch) | |
| tree | b6fe0414da3e2c84104b201aa740bd02083d25db /manifests/debian.pp | |
| parent | 2f6d7891e115f921c157567e2aa5afd6199c310e (diff) | |
| parent | dafb060fc57957dbe9e5e90698537e781cebeaf6 (diff) | |
Merge commit 'dafb060'
Conflicts:
manifests/debian.pp
Diffstat (limited to 'manifests/debian.pp')
| -rw-r--r-- | manifests/debian.pp | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index 345feae..d009e25 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,27 +12,33 @@ 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:///modules/site_apache/config/Debian/{$::fqdn}/apache2.conf", + path => "${config_dir}/apache2.conf", + source => [ "puppet:///modules/site_apache/config/Debian.${::lsbdistcodename}/${::fqdn}/apache2.conf", + "puppet:///modules/site_apache/config/Debian/${::fqdn}/apache2.conf", "puppet:///modules/site_apache/config/Debian.${::lsbdistcodename}/apache2.conf", - "puppet:///modules/site_apache/config/Debian/apache2.conf", - "puppet:///modules/apache/config/Debian/apache2.conf" ], + 'puppet:///modules/site_apache/config/Debian/apache2.conf', + "puppet:///modules/apache/config/Debian.${::lsbdistcodename}/${::fqdn}/apache2.conf", + "puppet:///modules/apache/config/Debian/${::fqdn}/apache2.conf", + "puppet:///modules/apache/config/Debian.${::lsbdistcodename}/apache2.conf", + 'puppet:///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', } } |