diff options
| author | mh <mh@immerda.ch> | 2012-05-31 11:38:45 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-05-31 11:38:45 +0200 |
| commit | 076909377eaa3aa41936e3acb7e02a9b5b14d493 (patch) | |
| tree | dae4bd4d405ffe1ba75ea1d50763bfbecf9e1a19 /manifests/debian.pp | |
| parent | 4ff385d82bc0d300d501bf1fb41df8602c7c95a6 (diff) | |
fix various puppet language things
Diffstat (limited to 'manifests/debian.pp')
| -rw-r--r-- | manifests/debian.pp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index 2054d2f..345feae 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -12,17 +12,16 @@ 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.${lsbdistcodename}/${fqdn}/apache2.conf", - "puppet:///modules/site_apache/config/Debian/{$fqdn}/apache2.conf", - "puppet:///modules/site_apache/config/Debian.${lsbdistcodename}/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'], |