diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-25 14:34:20 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-25 14:34:20 -0400 |
| commit | 090e59ad1fcba01e868237a83cadf9254cf09d3e (patch) | |
| tree | 0e48a01c0d0dc1fa0bf51e5b672b6e30243d6174 /manifests | |
| parent | 688f07793a72ba4453f6663b6d19fe6388ba382f (diff) | |
fix merge conflict resolution mistake
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/debian.pp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index 9180825..d009e25 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -19,11 +19,15 @@ 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/{$::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, |