From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:45756) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjTOJ-0005kY-A1 for guix-patches@gnu.org; Fri, 05 Jul 2019 14:57:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjTOH-0005fB-Tv for guix-patches@gnu.org; Fri, 05 Jul 2019 14:57:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjTOH-0005ev-Qo for guix-patches@gnu.org; Fri, 05 Jul 2019 14:57:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hjTOH-0003cg-NH for guix-patches@gnu.org; Fri, 05 Jul 2019 14:57:01 -0400 Subject: [bug#36404] [PATCH v5 3/4] Add 'guix deploy'. Resent-Message-ID: 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> <877e90tj7l.fsf_-_@sdf.lonestar.org> <8736jotj5v.fsf_-_@sdf.lonestar.org> <87y31gs4k5.fsf_-_@sdf.lonestar.org> <87y31cnb2t.fsf@gnu.org> <87ftnkgvo8.fsf_-_@sdf.lonestar.org> <878stcgvmf.fsf_-_@sdf.lonestar.org> <874l40gvl2.fsf_-_@sdf.lonestar.org> Date: Fri, 05 Jul 2019 14:56:07 -0400 In-Reply-To: <874l40gvl2.fsf_-_@sdf.lonestar.org> (Jakob L. Kreuze's message of "Fri, 05 Jul 2019 14:55:21 -0400") Message-ID: <87zhlsfgzc.fsf_-_@sdf.lonestar.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 36404@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable * guix/scripts/deploy.scm: New file. * Makefile.am (MODULES): Add it. =2D-- Makefile.am | 1 + guix/scripts/deploy.scm | 84 +++++++++++++++++++++++++++++++++++++++++ po/guix/POTFILES.in | 1 + 3 files changed, 86 insertions(+) create mode 100644 guix/scripts/deploy.scm diff --git a/Makefile.am b/Makefile.am index f10c000ea..4d3024e58 100644 =2D-- a/Makefile.am +++ b/Makefile.am @@ -267,6 +267,7 @@ MODULES =3D \ guix/scripts/weather.scm \ guix/scripts/container.scm \ guix/scripts/container/exec.scm \ + guix/scripts/deploy.scm \ guix.scm \ $(GNU_SYSTEM_MODULES) =20 diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm new file mode 100644 index 000000000..978cfb2a8 =2D-- /dev/null +++ b/guix/scripts/deploy.scm @@ -0,0 +1,84 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2019 David Thompson +;;; Copyright =C2=A9 2019 Jakob L. Kreuze +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix scripts deploy) + #:use-module (gnu machine) + #:use-module (guix scripts) + #:use-module (guix scripts build) + #:use-module (guix store) + #:use-module (guix ui) + #:use-module (ice-9 format) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-37) + #:export (guix-deploy)) + +;;; Commentary: +;;; +;;; This program provides a command-line interface to (gnu machine), allow= ing +;;; users to perform remote deployments through specification files. +;;; +;;; Code: + + + +(define (show-help) + (display (G_ "Usage: guix deploy [OPTION] FILE... +Perform the deployment specified by FILE.\n")) + (show-build-options-help) + (newline) + (display (G_ " + -h, --help display this help and exit")) + (display (G_ " + -V, --version display version information and exit")) + (newline) + (show-bug-report-information)) + +(define %options + (cons* (option '(#\h "help") #f #f + (lambda args + (show-help) + (exit 0))) + %standard-build-options)) + +(define %default-options + '((system . ,(%current-system)) + (substitutes? . #t) + (build-hook? . #t) + (graft? . #t) + (debug . 0) + (verbosity . 1))) + +(define (load-source-file file) + "Load FILE as a user module." + (let ((module (make-user-module '((gnu) (gnu machine) (gnu machine ssh))= ))) + (load* file module))) + +(define (guix-deploy . args) + (define (handle-argument arg result) + (alist-cons 'file arg result)) + (let* ((opts (parse-command-line args %options (list %default-options) + #:argument-handler handle-argument)) + (file (assq-ref opts 'file)) + (machines (or (and file (load-source-file file)) '()))) + (with-store store + (set-build-options-from-command-line store opts) + (for-each (lambda (machine) + (info (G_ "deploying to ~a...") (machine-display-name ma= chine)) + (run-with-store store (deploy-machine machine))) + machines)))) diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index bcd6f7637..f5fc4956b 100644 =2D-- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -67,6 +67,7 @@ guix/scripts/pack.scm guix/scripts/weather.scm guix/scripts/describe.scm guix/scripts/processes.scm +guix/scripts/deploy.scm guix/gnu-maintenance.scm guix/scripts/container.scm guix/scripts/container/exec.scm =2D-=20 2.22.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEa1VJLOiXAjQ2BGSm9Qb9Fp2P2VoFAl0fnUcACgkQ9Qb9Fp2P 2VoQ1RAAqYwk30Cf1qm0bkXMTHmjzsgIai+BVOWDeT05Vo2xbe4FjqJbXwaJFmns 7BmKOKoJVBcp8BWJP2/ODB/huq3YOeZcEU7Y4PqSOPjj1O63NLs7O42locdLwLVD If0Nwo/9IXxfHMsTEEQYPJ5FXeEyI7UL8+uA+1f9v3dKqc4VSFjx/nF6eYfj8XuQ Q7TMUXL4go1WMupT3YfGF7xTyYpKJ/+CPWn1kHTxqmh5DWdy6ul+QAdeYH1iSHBU /zFc2dK5/WIx2pvGN1Pcmae7qtUYphQyJaRlAJlXH8GT6AOAvvXff5HFRXzNf2Cp PhvyITmYIIcSjv3pyS+5ZZZIFRqYdFd8/i5fUlZ434rSZQph15w+WgbbSn+0LKa3 44R43saolhfZtYAmaIqL0GmEyIqYvj4hNBQLYYruKRfsg//JX1uMpG5L0US/fAR/ kZQ9ZmNTttq/azHVx0ibJrlvCEnapbjU4Qi9Sn5wG5xeVRyTb9EsZr7v12o9fU01 RqaEOH5mj0XzfMAMqBerBwYQITYdxa5poPprPIb/Nu7NK12iMl7SeHhGsy+Nxbi3 1VqKpLdblxBdEfozgoksywhtT+scTn9fqIxby03vxqNO2OoO3/6fifUmW2loumFY fe9LdfzwHSZjzwu6woBCcvIHvfp/6Ipeqd6rw+q+1or6uh0S41A= =CkXA -----END PGP SIGNATURE----- --=-=-=--