From patchwork Tue Sep 1 14:46:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 23851 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 09B1227BBE8; Tue, 1 Sep 2020 16:01:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CB51927BBE7 for ; Tue, 1 Sep 2020 16:01:12 +0100 (BST) Received: from localhost ([::1]:57958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD7mZ-0003VK-PJ for patchwork@mira.cbaines.net; Tue, 01 Sep 2020 11:01:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD7Zr-00082E-GU for guix-patches@gnu.org; Tue, 01 Sep 2020 10:48:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45190) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kD7Zr-0000uI-5q for guix-patches@gnu.org; Tue, 01 Sep 2020 10:48:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kD7Zq-0005qs-50 for guix-patches@gnu.org; Tue, 01 Sep 2020 10:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43155] [PATCH] hydra//build-machines: Update childhurd-net-options for secret-service. Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Sep 2020 14:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43155 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43155@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159897162721116 (code B ref -1); Tue, 01 Sep 2020 14:48:01 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 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=UTF-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/sysadmin/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." (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=net0" - "--netdev" ,(string-append - "user,id=net0" - ",hostfwd=tcp:0.0.0.0:" (qemu-vm-port 10022) "-:2222" - ",hostfwd=tcp:0.0.0.0:" (qemu-vm-port 15900) "-:5900")))) +are 10022 and 15900. Keep secret-service port local." + `("--device" "rtl8139,netdev=net0" + "--netdev" ,(string-append + "user,id=net0" + ",hostfwd=tcp:127.0.0.1:" + (number->string (hurd-vm-port + config + (@@ (gnu services virtualization) + %hurd-vm-secrets-port))) + "-:1004" + ",hostfwd=tcp:0.0.0.0:" + (number->string (hurd-vm-port + config + (@@ (gnu services virtualization) + %hurd-vm-ssh-port))) + "-:2222" + ",hostfwd=tcp:0.0.0.0:" + (number->string (hurd-vm-port + config + (@@ (gnu services virtualization) + %hurd-vm-vnc-port))) + "-:5900"))) (define sysadmins (list (sysadmin (name "ludo") -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com