From 44bff9308abf6468c795cfc1b580944afe8511b8 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 14 Feb 2015 15:01:00 +0100 Subject: [PATCH] create ssh key for buildd --- modules/buildd/manifests/init.pp | 7 +++++++ modules/debian-org/lib/facter/roleaccounts.rb | 13 ++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index 2fe6b6a5e..f11f64792 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -166,4 +166,11 @@ class buildd ($ensure=present) { owner => buildd, } + if ! $::buildd_key { + exec { 'create-buildd-key': + command => '/bin/su - buildd -c \'mkdir -p -m 02700 .ssh && ssh-keygen -C "`whoami`@`hostname` (`date +%Y-%m-%d`)" -P "" -f .ssh/id_rsa -q\'', + onlyif => '/usr/bin/getent passwd buildd > /dev/null && ! [ -e /home/buildd/.ssh/id_rsa ]' + } + } + } diff --git a/modules/debian-org/lib/facter/roleaccounts.rb b/modules/debian-org/lib/facter/roleaccounts.rb index 9726919b3..bb652f8cd 100644 --- a/modules/debian-org/lib/facter/roleaccounts.rb +++ b/modules/debian-org/lib/facter/roleaccounts.rb @@ -26,7 +26,6 @@ begin end - Facter.add("weblogsync_key") do setcode do key = nil @@ -51,6 +50,18 @@ begin end end + Facter.add("buildd_key") do + setcode do + key = nil + keyfile = '/home/buildd/.ssh/id_rsa.pub' + if FileTest.exist?(keyfile) + key = File.open(keyfile).read.chomp + end + key + end + end + + rescue Exception => e end # vim:set et: -- 2.20.1