From: mh Date: Sun, 21 Oct 2012 11:43:08 +0000 (+0200) Subject: use the full path X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=933b976b57eb025c8126e01a50cb25feb0be7157;p=puppet-lighttpd.git use the full path --- diff --git a/manifests/config/file.pp b/manifests/config/file.pp index bda958e..ca1abdd 100644 --- a/manifests/config/file.pp +++ b/manifests/config/file.pp @@ -4,7 +4,7 @@ define lighttpd::config::file( $conf_source = 'absent', $content = 'absent' ){ - file{"${lighttpd::conf_dir_name}/${name}.conf": + file{"${lighttpd::conf_dir}/${name}.conf": ensure => $ensure, require => Package['lighttpd'], notify => Service['lighttpd'], @@ -22,7 +22,7 @@ define lighttpd::config::file( case $content { 'absent': { - File["${lighttpd::conf_dir_name}/${name}.conf"]{ + File["${lighttpd::conf_dir}/${name}.conf"]{ source => $conf_source ? { 'absent' => [ "puppet:///modules/site_lighttpd/${lighttpd::conf_dir_name}/${::fqdn}/${name}.conf", @@ -40,7 +40,7 @@ define lighttpd::config::file( } } default: { - File["${lighttpd::conf_dir_name}/${name}.conf"]{ + File["${lighttpd::conf_dir}/${name}.conf"]{ content => $content, } }