--- puppet/deployment/websites/manifests/hugs.pp	2012/01/08 20:25:06	2203
+++ puppet/deployment/websites/manifests/hugs.pp	2012/02/10 14:20:13	2393
@@ -1,16 +1,16 @@
-class websites {
-    class hugs inherits base {
-        $vhostdir = "$webdatadir/hugs.$domain"
-        $svn_location = "svn://svn.$domain/svn/web/hugs/public/"
+class websites::hugs {
+    include websites::base
 
-    	apache::vhost_base { "hugs.$domain":
-	        location => $vhostdir,
-        }
+    $vhostdir = "$websites::base::webdatadir/hugs.$::domain"
+    $svn_location = "svn://svn.$::domain/svn/web/hugs/public/"
 
-        subversion::snapshot { "$vhostdir":
-            source => $svn_location
-        }
+    apache::vhost_base { "hugs.$::domain":
+        location => $vhostdir,
+    }
 
-        package { php-exif: }
+    subversion::snapshot { $vhostdir:
+        source => $svn_location
     }
+
+    package { 'php-exif': }
 }