diff --git a/manifests/init.pp b/manifests/init.pp index f35fafbaa..7fcd533e5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -225,7 +225,7 @@ case $::osfamily { 'debian': { $docroot = '/var/www' - $pidfile = '${APACHE_PID_FILE}' + $pidfile = "\${APACHE_PID_FILE}" $error_log = 'error.log' $error_documents_path = '/usr/share/apache2/error' $scriptalias = '/usr/lib/cgi-bin' diff --git a/manifests/mod.pp b/manifests/mod.pp index 2795578ec..1d38d3c4f 100644 --- a/manifests/mod.pp +++ b/manifests/mod.pp @@ -76,7 +76,7 @@ } } - file { "${_loadfile_name}": + file { $_loadfile_name: ensure => file, path => "${mod_dir}/${_loadfile_name}", owner => 'root', diff --git a/manifests/mod/cgid.pp b/manifests/mod/cgid.pp index 5c89251a1..2a0c178e0 100644 --- a/manifests/mod/cgid.pp +++ b/manifests/mod/cgid.pp @@ -4,7 +4,7 @@ # Debian specifies it's cgid sock path, but RedHat uses the default value # with no config file $cgisock_path = $::osfamily ? { - 'debian' => '${APACHE_RUN_DIR}/cgisock', + 'debian' => "\${APACHE_RUN_DIR}/cgisock", 'freebsd' => 'cgisock', default => undef, } diff --git a/manifests/mod/dav_fs.pp b/manifests/mod/dav_fs.pp index 482f31617..0cb663f5c 100644 --- a/manifests/mod/dav_fs.pp +++ b/manifests/mod/dav_fs.pp @@ -1,6 +1,6 @@ class apache::mod::dav_fs { $dav_lock = $::osfamily ? { - 'debian' => '${APACHE_LOCK_DIR}/DAVLock', + 'debian' => "\${APACHE_LOCK_DIR}/DAVLock", 'freebsd' => '/usr/local/var/DavLock', default => '/var/lib/dav/lockdb', } diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp index ff0e92927..7e115fb66 100644 --- a/manifests/mod/ssl.pp +++ b/manifests/mod/ssl.pp @@ -6,7 +6,7 @@ $package_name = undef, ) { $session_cache = $::osfamily ? { - 'debian' => '${APACHE_RUN_DIR}/ssl_scache(512000)', + 'debian' => "\${APACHE_RUN_DIR}/ssl_scache(512000)", 'redhat' => '/var/cache/mod_ssl/scache(512000)', 'freebsd' => '/var/run/ssl_scache(512000)', } @@ -18,7 +18,7 @@ } elsif $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '10.04' { $ssl_mutex = 'file:/var/run/apache2/ssl_mutex' } else { - $ssl_mutex = 'file:${APACHE_RUN_DIR}/ssl_mutex' + $ssl_mutex = "file:\${APACHE_RUN_DIR}/ssl_mutex" } } 'redhat': {