diff options
| author | mh <mh@immerda.ch> | 2013-12-28 17:26:14 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2013-12-28 17:26:14 +0100 |
| commit | 26e498007ae101aba154acc8435729768e9590ff (patch) | |
| tree | 0eefb408589499a168a3c9713acf62b8dad05acf /manifests/debian.pp | |
| parent | c3a52f63c2a97b8d6135bd3131b36550d97d388a (diff) | |
reduce dependency on lsb modules, rather use the builtin facts
Diffstat (limited to 'manifests/debian.pp')
| -rw-r--r-- | manifests/debian.pp | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index 345feae..7d1191d 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -3,36 +3,38 @@ class apache::debian inherits apache::package { $config_dir = '/etc/apache2' Package[apache] { - name => 'apache2', + name => 'apache2', } File[vhosts_dir] { - path => "${config_dir}/sites-enabled", + path => "${config_dir}/sites-enabled", } File[modules_dir] { - path => "${config_dir}/mods-enabled", + 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', + path => '/var/www/index.html', } file { 'apache_main_config': - path => "${config_dir}/apache2.conf", - source => [ "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" ], - require => Package['apache'], - notify => Service['apache'], - owner => root, group => 0, mode => 0644; + path => "${config_dir}/apache2.conf", + source => ["puppet:///modules/site_apache/config/Debian/${::fqdn}/apache2.conf", + "puppet:///modules/site_apache/config/Debian.${::operatingsystemmajrelease}/apache2.conf", + 'puppet:///modules/site_apache/config/Debian/apache2.conf', + 'puppet:///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, + ensure => absent, + path => '/etc/apache2/sites-enabled/000-default', } } |