diff options
Diffstat (limited to 'manifests/debian.pp')
| -rw-r--r-- | manifests/debian.pp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index 828245f..9180825 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -19,15 +19,11 @@ class apache::debian inherits apache::package { path => '/var/www/index.html', } file { 'apache_main_config': - 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.${::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' ], + 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, |