--- puppet/deployment/websites/manifests/static.pp	2012/01/08 20:25:06	2203
+++ puppet/deployment/websites/manifests/static.pp	2012/02/10 14:20:13	2393
@@ -1,17 +1,16 @@
-class websites {
-    class static inherits base {
-        $vhostdir = "$webdatadir/static.$domain"
+class websites::static {
+    include websites::base
+    $vhostdir = "$websites::base::webdatadir/static.$::domain"
 
-        apache::vhost_other_app { "static.$domain":
-            vhost_file => 'websites/vhost_static.conf',
-        }
+    apache::vhost_other_app { "static.$::domain":
+        vhost_file => 'websites/vhost_static.conf',
+    }
 
-        file { $vhostdir:
-            ensure => directory,
-        }
+    file { $vhostdir:
+        ensure => directory,
+    }
 
-        subversion::snapshot { "$vhostdir/g":
-            source => "svn://svn.$domain/svn/web/www/trunk/g/",
-        }
+    subversion::snapshot { "$vhostdir/g":
+        source => "svn://svn.$::domain/svn/web/www/trunk/g/",
     }
 }