variable enclosing fixes

8 files changed, 10 insertions, 10 deletions

diff --git a/deployment/websites/manifests/archives.pp b/deployment/websites/manifests/archives.pp
index ea66f3b8..825e082b 100644
--- a/deployment/websites/manifests/archives.pp
+++ b/deployment/websites/manifests/archives.pp
@@ -1,7 +1,7 @@
 class websites::archives {
     include websites::base
     $vhost = "archives.${::domain}"
-    $vhostdir = "$websites::base::webdatadir/${vhost}"
+    $vhostdir = "${websites::base::webdatadir}/${vhost}"
     $git_location = "git://git.${::domain}/web/archives"
 
     apache::vhost::base { $vhost:
diff --git a/deployment/websites/manifests/doc.pp b/deployment/websites/manifests/doc.pp
index 46e1230d..01474af2 100644
--- a/deployment/websites/manifests/doc.pp
+++ b/deployment/websites/manifests/doc.pp
@@ -1,7 +1,7 @@
 class websites::doc {
     include websites::base
     $vhost = "doc.${::domain}"
-    $vhostdir = "$websites::base::webdatadir/${vhost}"
+    $vhostdir = "${websites::base::webdatadir}/${vhost}"
     $git_location = "git://git.${::domain}/web/doc"
 
     apache::vhost::base { $vhost:
diff --git a/deployment/websites/manifests/hugs.pp b/deployment/websites/manifests/hugs.pp
index 27a554a7..95246464 100644
--- a/deployment/websites/manifests/hugs.pp
+++ b/deployment/websites/manifests/hugs.pp
@@ -1,7 +1,7 @@
 class websites::hugs {
     include websites::base
 
-    $vhostdir = "$websites::base::webdatadir/hugs.${::domain}"
+    $vhostdir = "${websites::base::webdatadir}/hugs.${::domain}"
     $git_location = "git://git.${::domain}/web/hugs"
 
     apache::vhost::base { "hugs.${::domain}":
diff --git a/deployment/websites/manifests/nav.pp b/deployment/websites/manifests/nav.pp
index 4e3f0330..84323c26 100644
--- a/deployment/websites/manifests/nav.pp
+++ b/deployment/websites/manifests/nav.pp
@@ -1,7 +1,7 @@
 class websites::nav {
     include websites::base
     $vhost = "nav.${::domain}"
-    $vhostdir = "$websites::base::webdatadir/${vhost}"
+    $vhostdir = "${websites::base::webdatadir}/${vhost}"
     $git_location = "git://git.${::domain}/web/nav"
 
     apache::vhost::base { $vhost:
diff --git a/deployment/websites/manifests/perl.pp b/deployment/websites/manifests/perl.pp
index 13bafb15..1911588b 100644
--- a/deployment/websites/manifests/perl.pp
+++ b/deployment/websites/manifests/perl.pp
@@ -1,7 +1,7 @@
 class websites::perl {
     include websites::base
     $vhost    = "perl.${::domain}"
-    $vhostdir = "$websites::base::webdatadir/${vhost}"
+    $vhostdir = "${websites::base::webdatadir}/${vhost}"
     $statsdir = "${vhostdir}/stats"
     $login    = 'pkgcpan'
     $homedir  = "/var/lib/${login}"
diff --git a/deployment/websites/manifests/releases.pp b/deployment/websites/manifests/releases.pp
index 91ad968b..2b25c8ec 100644
--- a/deployment/websites/manifests/releases.pp
+++ b/deployment/websites/manifests/releases.pp
@@ -1,7 +1,7 @@
 class websites::releases {
     include websites::base
     $vhost = "releases.${::domain}"
-    $vhostdir = "$websites::base::webdatadir/${vhost}"
+    $vhostdir = "${websites::base::webdatadir}/${vhost}"
     $git_location = "git://git.${::domain}/web/releases"
 
     apache::vhost::base { $vhost:
diff --git a/deployment/websites/manifests/static.pp b/deployment/websites/manifests/static.pp
index 55a7e596..66711329 100644
--- a/deployment/websites/manifests/static.pp
+++ b/deployment/websites/manifests/static.pp
@@ -1,6 +1,6 @@
 class websites::static {
     include websites::base
-    $vhostdir = "$websites::base::webdatadir/static.${::domain}"
+    $vhostdir = "${websites::base::webdatadir}/static.${::domain}"
 
     apache::vhost::other_app { "static.${::domain}":
         vhost_file => 'websites/vhost_static.conf',
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp
index 6a3d9963..8d5443d8 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
@@ -45,13 +45,13 @@ class websites::www {
         options  => ['FollowSymLinks'],
     }
 
-    apache::vhost_redirect { ${::domain}:
+    apache::vhost_redirect { "${::domain}":
         url => "http://www.${::domain}/",
     }
 
     apache::vhost_redirect { "ssl_${::domain}":
         use_ssl => true,
-        vhost   => ${::domain},
+        vhost   => "${::domain}",
         url     => "https://www.${::domain}/",
     }