1 files changed, 38 insertions, 32 deletions
diff --git a/modules/buildsystem/manifests/binrepo.pp b/modules/buildsystem/manifests/binrepo.pp
index ca3a7e55..5bf16b53 100644
--- a/modules/buildsystem/manifests/binrepo.pp
+++ b/modules/buildsystem/manifests/binrepo.pp
@@ -1,42 +1,48 @@
 class buildsystem::binrepo {
-        include buildsystem::base
-        include sudo
-        $login = 'binrepo'
-        $homedir = "/var/lib/$login"
-        $repodir = "$homedir/data"
+    include buildsystem::var::binrepo
+    include buildsystem::var::groups
+    include sudo
 
-        $uploadinfosdir = "$homedir/infos"
-        $uploadbinpath = '/usr/local/bin/upload-bin'
-        $uploadmail_from = "root@$::domain"
-        $uploadmail_to = "packages-commits@ml.$::domain"
+    # upload-bin script uses the mailx command provided by nail
+if versioncmp($::lsbdistrelease, '9') < 0 {
+    package { 'nail':
+        ensure => installed,
+    }
+} else {
+    package { 's-nail':
+        ensure => installed,
+    }
+}
 
-        # used in templates
-        $packagers_committers_group = $buildsystem::base::packagers_committers_group
+    user { $buildsystem::var::binrepo::login:
+        home    => $buildsystem::var::binrepo::homedir,
+    }
 
-        user { $login:
-            comment => 'Binary files repository',
-            home    => $homedir,
-        }
+    file { [$buildsystem::var::binrepo::repodir, $buildsystem::var::binrepo::uploadinfosdir]:
+        ensure => directory,
+        owner  => $buildsystem::var::binrepo::login,
+    }
 
-        file { [$repodir, $uploadinfosdir]:
-            ensure => directory,
-            owner  => $login,
-        }
+    mga_common::local_script {
+        'upload-bin':
+            content => template('buildsystem/binrepo/upload-bin');
+        'wrapper.upload-bin':
+            content => template('buildsystem/binrepo/wrapper.upload-bin');
+    }
 
-        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')
+    }
 
-        sudo::sudoers_config { 'binrepo':
-            content => template('buildsystem/binrepo/sudoers.binrepo')
-        }
+    apache::vhost::base { $buildsystem::var::binrepo::hostname:
+        location => $buildsystem::var::binrepo::repodir,
+        content  => template('buildsystem/binrepo/vhost_binrepo.conf'),
+    }
 
-        apache::vhost_base { "binrepo.$::domain":
-            location => $repodir,
-            content  => template('buildsystem/binrepo/vhost_binrepo.conf'),
-        }
+    apache::vhost::base { "ssl_${buildsystem::var::binrepo::hostname}":
+        use_ssl => true,
+        vhost => $buildsystem::var::binrepo::hostname,
+        location => $buildsystem::var::binrepo::repodir,
+        content  => template('buildsystem/binrepo/vhost_binrepo.conf'),
     }
 }