diff options
| author | varac <varacanero@zeromail.org> | 2013-03-10 15:41:35 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-03-10 15:41:35 +0100 |
| commit | dafb060fc57957dbe9e5e90698537e781cebeaf6 (patch) | |
| tree | bc45c85e1bae50a1ec4b9914baff4c668951e9ab /manifests/debian.pp | |
| parent | 077d4d1508b9ff3355f73ff8597991043b3ba5d9 (diff) | |
updated facts in file source for apache2.conf, linted
Diffstat (limited to 'manifests/debian.pp')
| -rw-r--r-- | manifests/debian.pp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index b7a5d9e..828245f 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -20,17 +20,19 @@ class apache::debian inherits apache::package { } file { 'apache_main_config': 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" ], + 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' ], require => Package['apache'], notify => Service['apache'], - owner => root, group => 0, mode => '0644'; + owner => root, + group => 0, + mode => '0644'; } apache::config::global{ 'charset': } apache::config::global{ 'security': } |