6 files changed, 41 insertions, 38 deletions
diff --git a/modules/buildsystem/manifests/binrepos.pp b/modules/buildsystem/manifests/binrepos.pp
new file mode 100644
index 00000000..eed01d6a
--- /dev/null
+++ b/modules/buildsystem/manifests/binrepos.pp
@@ -0,0 +1,41 @@
+class buildsystem {
+    class binrepo inherits base {
+        include sudo
+        $binrepo_login = "binrepo"
+        $binrepo_homedir = "/var/lib/$binrepo_login"
+        $binrepodir = "$binrepo_homedir/data"
+        $uploadinfosdir = "$binrepo_homedir/infos"
+        $uploadbinpath = '/usr/local/bin/upload-bin'
+        $uploadmail_from = "root@$domain"
+        $uploadmail_to = "packages-commits@ml.$domain"
+
+        $packagers_committers_group = $buildsystem::base::packagers_committers_group
+
+        user {"$binrepo_login":
+            ensure => present,
+            comment => "Binary files repository",
+            managehome => true,
+            shell => "/bin/bash",
+            home => "$binrepo_homedir",
+        }
+
+        file { [$binrepodir, $uploadinfosdir]:
+            ensure => directory,
+            owner => $binrepo_login,
+        }
+
+        local_script {
+            "upload-bin": content => template('buildsystem/binrepo/upload-bin');
+            "wrapper.upload-bin": content => template('buildsystem/binrepo/wrapper.upload-bin');
+        }
+
+        sudo::sudoers_config { "binrepo":
+            content => template("buildsystem/binrepo/sudoers.binrepo")
+        }
+
+        apache::vhost_base { "binrepo.$domain":
+            location => $binrepodir,
+            content => template("buildsystem/binrepo/vhost_binrepo.conf"),
+        }
+    }
+}
diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp
index ba042d35..cafa22f8 100644
--- a/modules/buildsystem/manifests/init.pp
+++ b/modules/buildsystem/manifests/init.pp
@@ -101,44 +101,6 @@ class buildsystem {
         }
     }
 
-    class binrepo inherits base {
-        include sudo
-        $binrepo_login = "binrepo"
-	$binrepo_homedir = "/var/lib/$binrepo_login"
-        $binrepodir = "$binrepo_homedir/data"
-	$uploadinfosdir = "$binrepo_homedir/infos"
-	$uploadbinpath = '/usr/local/bin/upload-bin'
-	$uploadmail_from = "root@$domain"
-	$uploadmail_to = "packages-commits@ml.$domain"
-
-	user {"$binrepo_login":
-	    ensure => present,
-	    comment => "Binary files repository",
-	    managehome => true,
-	    shell => "/bin/bash",
-	    home => "$binrepo_homedir",
-	}
-
-        file { [$binrepodir, $uploadinfosdir]:
-            ensure => directory,
-            owner => $binrepo_login,
-        }
-
-        local_script {
-            "upload-bin": content => template('buildsystem/upload-bin');
-            "wrapper.upload-bin": content => template('buildsystem/wrapper.upload-bin');
-        }
-
-	sudo::sudoers_config { "binrepo":
-	    content => template("buildsystem/sudoers.binrepo")
-	}
-
-	apache::vhost_base { "binrepo.$domain":
-	    location => $binrepodir,
-	    content => template("buildsystem/vhost_binrepo.conf"),
-	}
-    }
-    
     class youri_submit {
         include sudo
 
diff --git a/modules/buildsystem/templates/sudoers.binrepo b/modules/buildsystem/templates/binrepos/sudoers.binrepo
index 7a9efef4..7a9efef4 100644
--- a/modules/buildsystem/templates/sudoers.binrepo
+++ b/modules/buildsystem/templates/binrepos/sudoers.binrepo
diff --git a/modules/buildsystem/templates/upload-bin b/modules/buildsystem/templates/binrepos/upload-bin
index ef64a1a3..ef64a1a3 100755
--- a/modules/buildsystem/templates/upload-bin
+++ b/modules/buildsystem/templates/binrepos/upload-bin
diff --git a/modules/buildsystem/templates/vhost_binrepo.conf b/modules/buildsystem/templates/binrepos/vhost_binrepo.conf
index 8206614f..8206614f 100644
--- a/modules/buildsystem/templates/vhost_binrepo.conf
+++ b/modules/buildsystem/templates/binrepos/vhost_binrepo.conf
diff --git a/modules/buildsystem/templates/wrapper.upload-bin b/modules/buildsystem/templates/binrepos/wrapper.upload-bin
index 4e79e494..4e79e494 100644
--- a/modules/buildsystem/templates/wrapper.upload-bin
+++ b/modules/buildsystem/templates/binrepos/wrapper.upload-bin