From patchwork Tue Jul 2 17:55:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jakob L. Kreuze" X-Patchwork-Id: 14462 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 E763917133; Tue, 2 Jul 2019 21:12:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id A798517128 for ; Tue, 2 Jul 2019 21:12:52 +0100 (BST) Received: from localhost ([::1]:57014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiP91-0008CU-Sk for patchwork@mira.cbaines.net; Tue, 02 Jul 2019 16:12:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45646) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiN0d-0007dW-FX for guix-patches@gnu.org; Tue, 02 Jul 2019 13:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiN0c-0007WI-2o for guix-patches@gnu.org; Tue, 02 Jul 2019 13:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39059) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hiN0b-0007Uz-TG for guix-patches@gnu.org; Tue, 02 Jul 2019 13:56:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hiN0b-0008Tq-OV for guix-patches@gnu.org; Tue, 02 Jul 2019 13:56:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36404] [PATCH v4 0/4] Add 'guix deploy'. Resent-From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Jul 2019 17:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36404 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 36404-submit@debbugs.gnu.org id=B36404.156209012432532 (code B ref 36404); Tue, 02 Jul 2019 17:56:01 +0000 Received: (at 36404) by debbugs.gnu.org; 2 Jul 2019 17:55:24 +0000 Received: from localhost ([127.0.0.1]:47876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hiN00-0008Se-75 for submit@debbugs.gnu.org; Tue, 02 Jul 2019 13:55:24 -0400 Received: from mx.sdf.org ([205.166.94.20]:51327) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hiMzu-0008SR-Ua for 36404@debbugs.gnu.org; Tue, 02 Jul 2019 13:55:20 -0400 Received: from Upsilon (mobile-166-172-60-116.mycingular.net [166.172.60.116]) (authenticated (0 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id x62HtFKJ029505 (using TLSv1.2 with cipher AES256-GCM-SHA384 (256 bits) verified NO); Tue, 2 Jul 2019 17:55:16 GMT From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) References: <87o92ianbj.fsf@sdf.lonestar.org> <87o92glap5.fsf@dustycloud.org> <878sthoqzi.fsf@gnu.org> <87imsl9tsx.fsf_-_@sdf.lonestar.org> <87ef399tpu.fsf_-_@sdf.lonestar.org> <87a7dx9tog.fsf_-_@sdf.lonestar.org> <875zol9tn2.fsf_-_@sdf.lonestar.org> <871rz99tl9.fsf_-_@sdf.lonestar.org> <875zoldqah.fsf@kyleam.com> <87muhwtmfp.fsf@sdf.lonestar.org> <871rz874l2.fsf@kyleam.com> Date: Tue, 02 Jul 2019 13:55:10 -0400 In-Reply-To: <871rz874l2.fsf@kyleam.com> (Kyle Meyer's message of "Tue, 02 Jul 2019 13:02:01 -0400") Message-ID: <877e90tj7l.fsf_-_@sdf.lonestar.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 36404@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Kyle Meyer writes: > Reading that again, I see my suggestion has a typo: s/as/a/ It's alright, I picked up on it as I was copying it in :) Anyway, here's another revision updating the documentation. I had a go at making the environment types more like the service types, in the sense that configuration objects would be tied to the environment rather than the machine, but that would involve introducing an 'environment' object, which I thought to be too verbose. #+BEGIN_SRC scheme (list (machine (system %system) (environment (environment managed-host-environment-type (machine-ssh-configuration (host-name "localhost") (identity "./id_rsa") (port 2222)))))) #+END_SRC I suppose this could be avoided if I were to expose a different constructor for 'machine'. #+BEGIN_SRC scheme (list (machine %system (environment managed-host-environment-type (machine-ssh-configuration (host-name "localhost") (identity "./id_rsa") (port 2222))))) #+END_SRC I don't know if that's any better. Thoughts? Jakob L. Kreuze (4): ssh: Add 'identity' keyword to 'open-ssh-session'. gnu: Add machine type for deployment specifications. Add 'guix deploy'. doc: Add section for 'guix deploy'. Makefile.am | 4 +- doc/guix.texi | 107 ++++++++++++ gnu/local.mk | 5 +- gnu/machine.scm | 118 +++++++++++++ gnu/machine/ssh.scm | 363 ++++++++++++++++++++++++++++++++++++++++ guix/scripts/deploy.scm | 90 ++++++++++ guix/ssh.scm | 10 +- 7 files changed, 691 insertions(+), 6 deletions(-) create mode 100644 gnu/machine.scm create mode 100644 gnu/machine/ssh.scm create mode 100644 guix/scripts/deploy.scm