aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/buildsystem/manifests/iurt.pp2
-rw-r--r--modules/buildsystem/manifests/mainnode.pp4
-rw-r--r--modules/buildsystem/manifests/sshkeys.pp5
3 files changed, 1 insertions, 10 deletions
diff --git a/modules/buildsystem/manifests/iurt.pp b/modules/buildsystem/manifests/iurt.pp
index 3a428127..bdee8ac5 100644
--- a/modules/buildsystem/manifests/iurt.pp
+++ b/modules/buildsystem/manifests/iurt.pp
@@ -4,8 +4,6 @@ class buildsystem::iurt {
include buildsystem::iurt::packages
include buildsystem::var::iurt
- ssh::auth::client { $buildsystem::var::iurt::login: }
-
# remove old build directory
tidy { "${buildsystem::var::iurt::homedir}/iurt":
age => '8w',
diff --git a/modules/buildsystem/manifests/mainnode.pp b/modules/buildsystem/manifests/mainnode.pp
index b684217f..b5c17b57 100644
--- a/modules/buildsystem/manifests/mainnode.pp
+++ b/modules/buildsystem/manifests/mainnode.pp
@@ -12,11 +12,9 @@ class buildsystem::mainnode {
$sched_login = $buildsystem::var::scheduler::login
$sched_home_dir = $buildsystem::var::scheduler::homedir
- $build_login = $buildsystem::var::iurt::login
-
ssh::auth::client { $sched_login: }
- ssh::auth::server { [$sched_login, $build_login]: }
+ ssh::auth::server { $sched_login: }
apache::vhost::other_app { "repository.$::domain":
vhost_file => 'buildsystem/vhost_repository.conf',
diff --git a/modules/buildsystem/manifests/sshkeys.pp b/modules/buildsystem/manifests/sshkeys.pp
index 14edbe2f..6f5bba64 100644
--- a/modules/buildsystem/manifests/sshkeys.pp
+++ b/modules/buildsystem/manifests/sshkeys.pp
@@ -1,13 +1,8 @@
class buildsystem::sshkeys {
include ssh::auth
include buildsystem::var::scheduler
- include buildsystem::var::iurt
ssh::auth::key { $buildsystem::var::scheduler::login:
home => $buildsystem::var::scheduler::homedir,
}
-
- ssh::auth::key { $buildsystem::var::iurt::login:
- home => $buildsystem::var::iurt::homedir
- }
}