From patchwork Wed Sep 2 05:58:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 23863 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 ECA1927BBE8; Wed, 2 Sep 2020 06:59:08 +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 0C3C827BBE7 for ; Wed, 2 Sep 2020 06:59:08 +0100 (BST) Received: from localhost ([::1]:36628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDLnX-00087D-8l for patchwork@mira.cbaines.net; Wed, 02 Sep 2020 01:59:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDLnS-00086s-Az for guix-patches@gnu.org; Wed, 02 Sep 2020 01:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46417) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDLnS-0001zO-1X for guix-patches@gnu.org; Wed, 02 Sep 2020 01:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kDLnR-000070-VO for guix-patches@gnu.org; Wed, 02 Sep 2020 01:59:01 -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: Wed, 02 Sep 2020 05:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43155 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 43155@debbugs.gnu.org Received: via spool by 43155-submit@debbugs.gnu.org id=B43155.1599026322398 (code B ref 43155); Wed, 02 Sep 2020 05:59:01 +0000 Received: (at 43155) by debbugs.gnu.org; 2 Sep 2020 05:58:42 +0000 Received: from localhost ([127.0.0.1]:57963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDLn0-00006F-VV for submit@debbugs.gnu.org; Wed, 02 Sep 2020 01:58:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDLmy-000062-QD for 43155@debbugs.gnu.org; Wed, 02 Sep 2020 01:58:33 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39939) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDLms-0001y8-6W; Wed, 02 Sep 2020 01:58:26 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=44514 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 1kDLmq-0006Wr-5O; Wed, 02 Sep 2020 01:58:25 -0400 From: Jan Nieuwenhuizen Organization: AvatarAcademy.nl References: <87h7sha71o.fsf@gnu.org> <87r1rl6vpr.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Wed, 02 Sep 2020 07:58:13 +0200 In-Reply-To: <87r1rl6vpr.fsf@gnu.org> ("Ludovic =?utf-8?q?Court=C3=A8s?= "'s message of "Tue, 01 Sep 2020 23:19:44 +0200") Message-ID: <87h7sg67pm.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 Ludovic Courtès writes: Hi! > Jan Nieuwenhuizen skribis: > >> 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 >> >> /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 >> >> ...and then we should be able to start offloading builds for the Hurd. > > Yup! Probably we’ll create /etc/childhurd/HOST for each VM, so we also > need to adjust accordingly, right? Yes, we can add something like (secret-root (format #f "/etc/childhurd/~a" id)) to the (service hurd-vm-service-type (hurd-vm-configuration ... (i'm a bit curious, though, why we would want to differentiate between childhurds, they can be all identical?) > (I realize that the current code will silently keep going if we forget > to put the secret files in place; IOW, the service config doesn’t show > the files we intended to push as secrets. Oh well, we’ll see that > later.) Yes, I guess that's a feature -- "you" can start it once, then do something like mkdir -p /etc/childhurd/etc scp -r childhurd:/etc/guix /etc/childhurd/etc scp -r childhurd:/etc/ssh /etc/childhurd/etc >> (I guess we then also need to add a cuirass jobs for the Hurd?) > > Yes, or maybe just change ‘systems’ in the Cuirass specs for > ‘guix-master’, but then it’ll try to build everything for GNU/Hurd, > which doesn’t sound like a great idea for now. I agree, not much sense in that yet. > Perhaps we can simply add a separate jobset pulling from ‘master’ but > building only for i586-gnu and only the “core” package set? Hmm, why can't I find the definition of "core"?. Anyway, It would be a great first step to build (everything needef for) "hello", after that we want to have/try "guile-3.0" and possibly "guix". >>>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). > > LGTM, thanks! Great, pushed to guix-maintenance as 04c0fc1ea110b82d6180bbc1b2f895e55e746cd8 Janneke ...after first pushing this -- Ooopss typo fix From 35dd1de08f1b812a22184e925b089ffc471c52de Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 2 Sep 2020 07:52:13 +0200 Subject: [PATCH 1/2] hydra/build-machines: Oops, typo in childhurd-net-options. 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]: Remove stray dot from parameter list. --- hydra/modules/sysadmin/build-machines.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hydra/modules/sysadmin/build-machines.scm b/hydra/modules/sysadmin/build-machines.scm index b4afcbe..0a3e113 100644 --- a/hydra/modules/sysadmin/build-machines.scm +++ b/hydra/modules/sysadmin/build-machines.scm @@ -118,7 +118,7 @@ EMULATED-ARCHITECTURES, unless it's empty." (mcron-configuration (jobs (list gc-job)))) (operating-system-user-services %hurd-vm-operating-system))))) - (define (childhurd-net-options . config) + (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)) -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com