aboutsummaryrefslogtreecommitdiffstats
path: root/modules/apache/manifests/vhost/base.pp
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-10-19 21:31:26 +0300
committerThomas Backlund <tmb@mageia.org>2015-10-19 21:31:26 +0300
commite9d95e0776dd39ed8881c40413240d55ca1b5786 (patch)
treee142fca6e879ddc56f737dd4a56849f523a6ab44 /modules/apache/manifests/vhost/base.pp
parentbd3ba78ce61e869e68d2815a0c2b3651efed60ce (diff)
downloadpuppet-e9d95e0776dd39ed8881c40413240d55ca1b5786.tar
puppet-e9d95e0776dd39ed8881c40413240d55ca1b5786.tar.gz
puppet-e9d95e0776dd39ed8881c40413240d55ca1b5786.tar.bz2
puppet-e9d95e0776dd39ed8881c40413240d55ca1b5786.tar.xz
puppet-e9d95e0776dd39ed8881c40413240d55ca1b5786.zip
lint fixes for apache
Diffstat (limited to 'modules/apache/manifests/vhost/base.pp')
-rw-r--r--modules/apache/manifests/vhost/base.pp11
1 files changed, 5 insertions, 6 deletions
diff --git a/modules/apache/manifests/vhost/base.pp b/modules/apache/manifests/vhost/base.pp
index a7e5720d..1ddc00cc 100644
--- a/modules/apache/manifests/vhost/base.pp
+++ b/modules/apache/manifests/vhost/base.pp
@@ -10,7 +10,7 @@ define apache::vhost::base ($content = '',
$enable_public_html = false) {
include apache::base
$httpd_logdir = '/var/log/httpd'
- $filename = "$name.conf"
+ $filename = "${name}.conf"
if ! $vhost {
$real_vhost = $name
@@ -19,12 +19,12 @@ define apache::vhost::base ($content = '',
}
if ! $access_logfile {
- $real_access_logfile = "$httpd_logdir/${real_vhost}-access_log"
+ $real_access_logfile = "${httpd_logdir}/${real_vhost}-access_log"
} else {
$real_access_logfile = $access_logfile
}
if ! $error_logfile {
- $real_error_logfile = "$httpd_logdir/${real_vhost}-error_log"
+ $real_error_logfile = "${httpd_logdir}/${real_vhost}-error_log"
} else {
$real_error_logfile = $error_logfile
}
@@ -34,7 +34,7 @@ define apache::vhost::base ($content = '',
if $wildcard_sslcert != true {
openssl::self_signed_cert{ $real_vhost:
directory => '/etc/ssl/apache/',
- before => Apache::Config["/etc/httpd/conf/vhosts.d/$filename"],
+ before => Apache::Config["/etc/httpd/conf/vhosts.d/${filename}"],
}
}
}
@@ -43,8 +43,7 @@ define apache::vhost::base ($content = '',
include apache::mod::public_html
}
- apache::config { "/etc/httpd/conf/vhosts.d/$filename":
+ apache::config { "/etc/httpd/conf/vhosts.d/${filename}":
content => template('apache/vhost_base.conf')
}
}
-