aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/websites/manifests/www.pp
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-10-19 20:16:53 +0300
committerThomas Backlund <tmb@mageia.org>2015-10-19 20:16:53 +0300
commit814d434eb7e7d8a89dac98b1a60afc10a6980617 (patch)
tree27c7b9409f7be3942ab0a5039bd9349bb4fc09dc /deployment/websites/manifests/www.pp
parent9b5ad1460988eaa2fa11e0c5585ab7537b15c131 (diff)
downloadpuppet-814d434eb7e7d8a89dac98b1a60afc10a6980617.tar
puppet-814d434eb7e7d8a89dac98b1a60afc10a6980617.tar.gz
puppet-814d434eb7e7d8a89dac98b1a60afc10a6980617.tar.bz2
puppet-814d434eb7e7d8a89dac98b1a60afc10a6980617.tar.xz
puppet-814d434eb7e7d8a89dac98b1a60afc10a6980617.zip
lint fixes for websites
Diffstat (limited to 'deployment/websites/manifests/www.pp')
-rw-r--r--deployment/websites/manifests/www.pp10
1 files changed, 5 insertions, 5 deletions
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp
index e4ddfd69..0a84f7e9 100644
--- a/deployment/websites/manifests/www.pp
+++ b/deployment/websites/manifests/www.pp
@@ -1,7 +1,7 @@
class websites::www {
include websites::base
$vhost = "www.$::domain"
- $vhostdir = "$websites::base::webdatadir/$vhost"
+ $vhostdir = "$websites::base::webdatadir/${vhost}"
$git_location = "git://git.$::domain/web/www"
include apache::var
@@ -15,28 +15,28 @@ class websites::www {
source => $git_location,
}
- file { "$vhostdir/var/tmp/cache":
+ file { "${vhostdir}/var/tmp/cache":
ensure => directory,
group => $apache::var::apache_group,
mode => '0660',
require => Git::Snapshot[$vhostdir],
}
- file { "$vhostdir/_nav/var/tmp/cache":
+ file { "${vhostdir}/_nav/var/tmp/cache":
ensure => directory,
group => $apache::var::apache_group,
mode => '0660',
require => Git::Snapshot[$vhostdir],
}
- apache::vhost::base { $vhost:
+ apache::vhost::base { $vhost}:
content => template('websites/vhost_www.conf',
'websites/vhost_www_rewrite.conf'),
location => $vhostdir,
options => ['FollowSymLinks'],
}
- apache::vhost::base { "ssl_$vhost":
+ apache::vhost::base { "ssl_${vhost}":
use_ssl => true,
vhost => $vhost,
content => template('websites/vhost_www.conf',