1 files changed, 44 insertions, 49 deletions
diff --git a/modules/draklive/manifests/init.pp b/modules/draklive/manifests/init.pp
index 0f643bb4..ade2527f 100644
--- a/modules/draklive/manifests/init.pp
+++ b/modules/draklive/manifests/init.pp
@@ -1,63 +1,58 @@
 class draklive {
-    class variable {
-        $draklive_login = 'draklive'
-        $draklive_home = '/home/draklive'
-        $draklive_config = "$draklive_home/live-config"
-        $draklive_var_data = "$draklive_home/var-data"
-	$isomakers_group = 'mga-iso_makers'
+    $login = 'draklive'
+    $home = '/home/draklive'
+    $config = "${home}/live-config"
+    $var_data = "${home}/var-data"
+    # TODO merge with bcd
+        $isomakers_group = 'mga-iso_makers'
+
+        include sudo
+
+    group { $login: }
+
+    user { $login:
+        home       => $home,
+        comment    => 'User for creating live ISOs',
     }
 
-    class base inherits variable {
-	include sudo
+    package { 'drakiso': }
 
-        buildsystem::sshuser { $draklive_login:
-            homedir => $draklive_home,
-            comment => "User for creating live ISOs",
-	}
+    sudo::sudoers_config { 'draklive':
+        content => template('draklive/sudoers.draklive')
+    }
 
-        package { draklive:
-	    ensure => 'installed',
+        file { $var_data:
+            ensure => directory,
+            owner  => $login,
+            group  => $login,
+            mode   => '0755',
         }
 
-        sudo::sudoers_config { "draklive":
-	    content => template("draklive/sudoers.draklive")
+        file { '/var/lib/draklive':
+            ensure => symlink,
+            target => $var_data,
         }
 
-	file { $draklive_var_data:
-	    ensure => directory,
-	    owner => $draklive_login,
-	    group => $draklive_login,
-	    mode => 755,
-	}
-
-	file { "/var/lib/draklive":
-	     ensure => symlink,
-	     target => $draklive_var_data,
-	}
+    git::snapshot { $config:
+        source => "git://git.${::domain}/software/build-system/draklive-config",
+        user   => $login,
+    }
 
-        subversion::snapshot { $draklive_config:
-            source => "svn://svn.$domain/soft/images-config/draklive/trunk/",
-        }
+    cron { 'build live images':
+        command => "${config}/tools/build_live.sh",
+        user    => $login,
+        hour    => '4',
+        minute  => '30',
+    }
 
-        cron { "build live images":
-            command => "$draklive_config/tools/build_live.sh",
-            user => $draklive_login,
-            hour => "4",
-            minute => "30",
-        }
+    file { '/usr/local/bin/clean-live.sh':
+        mode   => '0755',
+        source => 'puppet:///modules/draklive/clean-live.sh',
+    }
 
-        file { "/usr/local/bin/clean-live.sh":
-            ensure => present,
-            owner => root,
-            group => root,
-            mode => 755,
-            source => "puppet:///modules/draklive/clean-live.sh",
-        }
-    
-        cron { "clean live build data":
-            command => "/usr/local/bin/clean-live.sh",
-            hour => "4",
-            minute => "20",
-        }
+    cron { 'clean live build data':
+        command => '/usr/local/bin/clean-live.sh',
+        hour    => '4',
+        minute  => '20',
     }
 }