5 files changed, 50 insertions, 44 deletions
diff --git a/modules/buildsystem/manifests/iurt/config.pp b/modules/buildsystem/manifests/iurt/config.pp
index 88c08b66..02f5be63 100644
--- a/modules/buildsystem/manifests/iurt/config.pp
+++ b/modules/buildsystem/manifests/iurt/config.pp
@@ -1,11 +1,50 @@
 define buildsystem::iurt::config() {
+    include buildsystem::var::iurt
+    include buildsystem::var::webstatus
+    include buildsystem::var::repository
     $distribution = $name
     # TODO rename the variable too in template
-    $build_login = $buildsystem::iurt::user::login
+    $build_login = $buildsystem::var::iurt::login
 
-    file { "/etc/iurt/build/$distribution.conf":
+    $build_timeout = {
+      'default' => 36000,
+      'atlas' => 57600,
+      'blender' => 57600,
+      'chromium-browser-stable' => 172800,
+      'clang' => 172800,
+      'cross-gcc' => 115200,
+      'gcc' => 115200,
+      'itk' => 115200,
+      'java-1.8.0-openjdk' => 172800,
+      'java-17-openjdk' => 172800,
+      'java-21-openjdk' => 172800,
+      'java-latest-openjdk' => 172800,
+      'kernel' => 115200,
+      'libreoffice' => 432000,
+      'llvm' => 115200,
+      'llvm17-suite' => 115200,
+      'llvm19-suite' => 115200,
+      'openfoam' => 115200,
+      'paraview' => 115200,
+      'qgis' => 57600,
+      'qtwebengine5' => 115200,
+      'qtwebengine6' => 172800,
+      'rust' => 180000,
+      'salome' => 57600,
+      'vtk' => 57600,
+      'webkit' => 57600,
+      'webkit2' => 115200,
+      'wrapitk' => 115200,
+      'rocm-llvm' => 70000,
+    }
+
+    $allow_network_access = [
+      'libguestfs', # Needs access to the configured mirrors
+    ]
+
+    file { "/etc/iurt/build/${distribution}.conf":
         owner   => $build_login,
         group   => $build_login,
-        content => template("buildsystem/iurt/$distribution.conf")
+        content => template("buildsystem/iurt.conf")
     }
 }
diff --git a/modules/buildsystem/manifests/iurt/init.pp b/modules/buildsystem/manifests/iurt/init.pp
deleted file mode 100644
index 9f5780bd..00000000
--- a/modules/buildsystem/manifests/iurt/init.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-class buildsystem::iurt {
-    include sudo
-    include buildsystem::iurt::user
-    include buildsystem::iurt::package
-    $login = $buildsystem::iurt::user::login
-    $homedir = $buildsystem::iurt::user::homedir
-
-    ssh::auth::client { $login: }
-
-    ssh::auth::server { $buildsystem::base::sched_login:
-                        user => $login
-    }
-
-    # remove old build directory
-    tidy { "$homedir/iurt":
-        age     => '8w',
-        recurse => true,
-        matches => ['[0-9][0-9].*\..*\..*\.[0-9]*','log','*.rpm','*.log','*.mga[0-9]+'],
-        rmdirs  => true,
-    }
-
-    file { '/etc/iurt/build':
-        ensure => directory,
-    }
-
-   buildsystem::iurt::config { ['1','cauldron','mandriva2010.1','infra_1']: }
-
-    sudo::sudoers_config { 'iurt':
-        content => template('buildsystem/iurt/sudoers.iurt')
-    }
-}
diff --git a/modules/buildsystem/manifests/iurt/packages.pp b/modules/buildsystem/manifests/iurt/packages.pp
index 448b4a89..e814b7c2 100644
--- a/modules/buildsystem/manifests/iurt/packages.pp
+++ b/modules/buildsystem/manifests/iurt/packages.pp
@@ -1,3 +1,3 @@
 class buildsystem::iurt::packages {
     package { 'iurt': }
-} 
+}
diff --git a/modules/buildsystem/manifests/iurt/upload.pp b/modules/buildsystem/manifests/iurt/upload.pp
index e971e338..5417d36e 100644
--- a/modules/buildsystem/manifests/iurt/upload.pp
+++ b/modules/buildsystem/manifests/iurt/upload.pp
@@ -1,7 +1,7 @@
 class buildsystem::iurt::upload {
-    $login = $buildsystem::iurt::user::login
-    $homedir = $buildsystem::iurt::user::homedir
-
+    include buildsystem::var::iurt
+    include buildsystem::var::webstatus
+    include buildsystem::var::repository
     file { '/etc/iurt/upload.conf':
         require => File['/etc/iurt'],
         content => template('buildsystem/upload.conf'),
@@ -10,7 +10,7 @@ class buildsystem::iurt::upload {
 
     exec { 'check iurt config':
         refreshonly => true,
-        cmd         => 'perl -cw /etc/iurt/upload.conf',
+        command     => 'perl -cw /etc/iurt/upload.conf',
         logoutput   => 'on_failure',
     }
 }
diff --git a/modules/buildsystem/manifests/iurt/user.pp b/modules/buildsystem/manifests/iurt/user.pp
index a70c25c1..a93ac7e7 100644
--- a/modules/buildsystem/manifests/iurt/user.pp
+++ b/modules/buildsystem/manifests/iurt/user.pp
@@ -1,10 +1,8 @@
 class buildsystem::iurt::user {
-    $login = 'iurt'
-    $homedir = "/home/$login"
+    include buildsystem::var::iurt
 
-    sshuser { $login:
-        homedir => $homedir,
-        comment => 'System user used to run build bots',
+    buildsystem::sshuser { $buildsystem::var::iurt::login:
+        homedir => $buildsystem::var::iurt::homedir,
     }
 
     file { '/etc/iurt':