From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 01 10:47:07 2020 Received: (at submit) by debbugs.gnu.org; 1 Sep 2020 14:47:07 +0000 Received: from localhost ([127.0.0.1]:56733 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kD7Yo-0005NN-FX for submit@debbugs.gnu.org; Tue, 01 Sep 2020 10:47:07 -0400 Received: from lists.gnu.org ([209.51.188.17]:48190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kD7Ym-0005Lu-Ml for submit@debbugs.gnu.org; Tue, 01 Sep 2020 10:46:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD7Ym-0005pT-93 for guix-patches@gnu.org; Tue, 01 Sep 2020 10:46:56 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52496) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD7Yl-0000oe-6C; Tue, 01 Sep 2020 10:46:55 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=59990 helo=dundal.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kD7Yi-0004Gl-SB; Tue, 01 Sep 2020 10:46:54 -0400 From: Jan Nieuwenhuizen To: guix-patches@gnu.org Subject: [PATCH] hydra//build-machines: Update childhurd-net-options for secret-service. Organization: AvatarAcademy.nl X-Url: http://AvatarAcademy.nl Date: Tue, 01 Sep 2020 16:46:43 +0200 Message-ID: <87h7sha71o.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Hi! With bug https://bugs.gnu.org/43106 just closed we now have a nice way to inject secrets into the Childhurds. Using the attached patch, which needs a fresh pull and reconfigure on berlin (at least the nodes 101,102 that run Childhurds), we can create a tree of childhurd secrets like so --8<---------------cut here---------------start------------->8--- /etc/childhurd/etc/guix/signing-key.pub /etc/childhurd/etc/guix/signing-key.sec /etc/childhurd/etc/ssh/ssh_host_ed25519_key /etc/childhurd/etc/ssh/ssh_host_ecdsa_key /etc/childhurd/etc/ssh/ssh_host_ed25519_key.pub /etc/childhurd/etc/ssh/ssh_host_ecdsa_key.pub --8<---------------cut here---------------end--------------->8--- ...and then we should be able to start offloading builds for the Hurd. (I guess we then also need to add a cuirass jobs for the Hurd?) Janneke --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-hydra-build-machines-Update-childhurd-net-options-fo.patch Content-Transfer-Encoding: quoted-printable From 6d1c388ed82c260af27b556c0677e780ee410b05 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 1 Sep 2020 16:31:42 +0200 Subject: [PATCH] hydra//build-machines: Update childhurd-net-options for secret-service. Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=3DUTF-8 * hydra/modules/sysadmin/build-machines.scm (berlin-new-build-machine-os) [childhurd-net-options]: Include secret-service local QEMU forwarding. Use variables from (gnu services virtualization). --- hydra/modules/sysadmin/build-machines.scm | 31 ++++++++++++++++------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/hydra/modules/sysadmin/build-machines.scm b/hydra/modules/sysa= dmin/build-machines.scm index b4afcbe..0385b6a 100644 --- a/hydra/modules/sysadmin/build-machines.scm +++ b/hydra/modules/sysadmin/build-machines.scm @@ -120,15 +120,28 @@ EMULATED-ARCHITECTURES, unless it's empty." =20 (define (childhurd-net-options . config) "Expose SSH and VNC ports on 0.0.0.0; for first Childhurd VM those -are 10022 and 15900." - (let ((id 0)) - (define (qemu-vm-port base) - (number->string (+ base (* 1000 id)))) - `("--device" "rtl8139,netdev=3Dnet0" - "--netdev" ,(string-append - "user,id=3Dnet0" - ",hostfwd=3Dtcp:0.0.0.0:" (qemu-vm-port 10022) "-:222= 2" - ",hostfwd=3Dtcp:0.0.0.0:" (qemu-vm-port 15900) "-:590= 0")))) +are 10022 and 15900. Keep secret-service port local." + `("--device" "rtl8139,netdev=3Dnet0" + "--netdev" ,(string-append + "user,id=3Dnet0" + ",hostfwd=3Dtcp:127.0.0.1:" + (number->string (hurd-vm-port + config + (@@ (gnu services virtualization) + %hurd-vm-secrets-port))) + "-:1004" + ",hostfwd=3Dtcp:0.0.0.0:" + (number->string (hurd-vm-port + config + (@@ (gnu services virtualization) + %hurd-vm-ssh-port))) + "-:2222" + ",hostfwd=3Dtcp:0.0.0.0:" + (number->string (hurd-vm-port + config + (@@ (gnu services virtualization) + %hurd-vm-vnc-port))) + "-:5900"))) =20 (define sysadmins (list (sysadmin (name "ludo") --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com --=-=-=--