1 files changed, 12 insertions, 44 deletions
diff --git a/modules/buildsystem/manifests/mainnode.pp b/modules/buildsystem/manifests/mainnode.pp
index 26755d96..01de764f 100644
--- a/modules/buildsystem/manifests/mainnode.pp
+++ b/modules/buildsystem/manifests/mainnode.pp
@@ -1,55 +1,23 @@
 class buildsystem::mainnode {
-    include buildsystem::base
+    include buildsystem::var::repository
+    include buildsystem::var::scheduler
+    include buildsystem::var::distros
     include buildsystem::iurt::user
     include buildsystem::scheduler
     include buildsystem::gatherer
     include buildsystem::mgarepo
     include buildsystem::signbot
     include buildsystem::youri_submit
+    include buildsystem::sshkeys
+    include buildsystem::distros
 
-    $sched_login = $buildsystem::base::sched_login
-    $sched_home_dir = $buildsystem::base::sched_home_dir
-    $build_login = $buildsystem::iurt::user::login
-    $repository_root = $buildsystem::base::repository_root
-
-    sshuser { $sched_login:
-        homedir => $sched_home_dir,
-        comment => 'System user used to schedule builds',
-    }
-
-    ssh::auth::client { $sched_login: }
-
-    ssh::auth::server { [$sched_login, $build_login]: }
-
-    $mirror_root = '/distrib/mirror'
-    apache::vhost_other_app { "repository.$::domain":
-        vhost_file => 'buildsystem/vhost_repository.conf',
-    }
-
-    $location = '/var/www/bs'
-    file { [$location,"$location/data"]:
-        ensure => directory,
+    sshkeys::set_client_key_pair { $buildsystem::var::scheduler::login:
+        home => $buildsystem::var::scheduler::homedir,
+        user => $buildsystem::var::scheduler::login,
     }
-
-    apache::vhost_base { "pkgsubmit.$::domain":
-        aliases  => { '/uploads' => "$sched_home_dir/uploads" },
-        location => $location,
-        content  => template('buildsystem/vhost_pkgsubmit.conf'),
-    }
-
-    subversion::snapshot { $location:
-        source => "svn://svn.$::domain/soft/buildsystem/web/",
-    }
-
-    file { $repository_root:
-        ensure => directory,
-    }
-
-    buildsystem::media_cfg { ['i586','x86_64']: }
-
-    cron { 'dispatch jobs':
-        user    => $sched_login,
-        command => 'ulri; emi',
-        minute  => '*',
+    sshkeys::set_authorized_keys { 'scheduler-allow-scheduler':
+        keyname => $buildsystem::var::scheduler::login,
+        home    => $buildsystem::var::scheduler::homedir,
+        user    => $buildsystem::var::scheduler::login,
     }
 }