--- puppet/deployment/websites/manifests/releases.pp	2012/01/08 20:25:06	2203
+++ puppet/deployment/websites/manifests/releases.pp	2012/03/17 16:53:34	2580
@@ -1,22 +1,22 @@
-class websites {
-    class releases inherits base {
-        $vhostdir = "$webdatadir/releases.$domain"
-        $svn_location = "svn://svn.$domain/svn/web/releases/"
+class websites::releases {
+    include websites::base
+    $vhost = "releases.$::domain"
+    $vhostdir = "$websites::base::webdatadir/$vhost"
+    $svn_location = "svn://svn.$::domain/svn/web/releases/"
 
-        apache::vhost_base { "releases.$domain":
-            location => $vhostdir,
-            options => [ "FollowSymLinks" ],
-	    }
+    apache::vhost_base { $vhost:
+        location => $vhostdir,
+        options  => [ 'FollowSymLinks' ],
+    }
 
-    	apache::vhost_base { "ssl_releases.$domain":
-            vhost => "releases.$domain",
-            use_ssl => true,
-            location => $vhostdir,
-            options => [ "FollowSymLinks" ],
-        }
+    apache::vhost_base { "ssl_$vhost":
+        vhost    => $vhost,
+        use_ssl  => true,
+        location => $vhostdir,
+        options  => [ 'FollowSymLinks' ],
+    }
 
-        subversion::snapshot { "$vhostdir":
-            source => $svn_location,
-        }
+    subversion::snapshot { $vhostdir:
+        source => $svn_location,
     }
 }