From patchwork Sat May 2 13:47:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 21837 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 17FB627BBE4; Sat, 2 May 2020 14:49:13 +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.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 81B0627BBE1 for ; Sat, 2 May 2020 14:49:12 +0100 (BST) Received: from localhost ([::1]:51108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUsW0-0007aL-0x for patchwork@mira.cbaines.net; Sat, 02 May 2020 09:49:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUsVt-0007Xz-NP for guix-patches@gnu.org; Sat, 02 May 2020 09:49:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUsVr-0007oe-JI for guix-patches@gnu.org; Sat, 02 May 2020 09:49:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUsVr-0007oT-4R for guix-patches@gnu.org; Sat, 02 May 2020 09:49:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUsVr-0005Hd-2e for guix-patches@gnu.org; Sat, 02 May 2020 09:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41018] [PATCH] gnu: Add AutoSSH service. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 May 2020 13:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41018 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: pinoaffe Cc: 41018@debbugs.gnu.org Received: via spool by 41018-submit@debbugs.gnu.org id=B41018.158842730120201 (code B ref 41018); Sat, 02 May 2020 13:49:03 +0000 Received: (at 41018) by debbugs.gnu.org; 2 May 2020 13:48:21 +0000 Received: from localhost ([127.0.0.1]:51612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUsVB-0005Fl-52 for submit@debbugs.gnu.org; Sat, 02 May 2020 09:48:21 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:46439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUsV7-0005FV-0D for 41018@debbugs.gnu.org; Sat, 02 May 2020 09:48:19 -0400 Received: by mail-lf1-f66.google.com with SMTP id g10so5913801lfj.13 for <41018@debbugs.gnu.org>; Sat, 02 May 2020 06:48:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=lZCBNh+0ukuM+wzQMdNAwZMGwrdT1a+DHWJU7UcLiBA=; b=CzwEgSFAVBKloaEBx4jCnK9n5wIU902qju8pp8zm2VmQ8plsebe1XtQihjHo0SsBOV uYW9h718rbO21ZCi+PM6ChyC7FTy69J4tyuOmfpaM/Vqu4piekwc5lMWWbfTNuVCqxQp u18y+Q70qIsLhqjTshekz+Ec105Zm9q8EPqZbOLpEmEfwwzPJflfCafIkhnbbpJvE7fU RBOcXcT3Fb4RnymTY36AIiR/2ZK79J20nRC3TIekWTUDQFzwOn8s2jwEmM0mGOnoBiK1 cgTZkXJec7fZn44el54EetlByzU3nW3ryvD7gy7/abdpH0gLFZynxZkzn86xdUjLExIe zpNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=lZCBNh+0ukuM+wzQMdNAwZMGwrdT1a+DHWJU7UcLiBA=; b=kpRdUmfFEpHJI9HzXwh1mtmRahJC5nrTuwvLmM7qtkia+WxdcsvwTPKCL9Gj3Fi0n/ sruykaaTfbLInpxVvqqoXP9+HESlnBBGKbrx9BOakY/vuIpCZ6u8rUb7RegACLYQ+BVG ur7nPBf/p/vZCrtt/hm4FJ8OAv+LGG/eR/Q9JLZN1qSkTdGxso4Bp7jRqTdiVhvMAZjv 2MhvEqWEo1j5sGqldoD8aPaC1iK6PZ/qEd4gmoFqThX4JUB60a3+cYL/ycolMSFinJiv KXMLwSUXZUP79LN0Dbd4DJHUh5gJFsEEZ7JWOzwCoxT+0hxw80Ix4YpnLFGEagCFU4g7 9+sw== X-Gm-Message-State: AGi0PuaPI9z5dJ6r4vPSwM2pIhEANisfWfZnAHD6kW7eWRhkwmFAk6VW hCeMl4xcq5A2a8Q+7PlzMm57B090 X-Google-Smtp-Source: APiQypKmF616MZxRTDTmn8EmzATwSsLX+Yp0EnS9LHJM76+Xqpb52cVmdqj9axkPf+T5m1rVfXaOmw== X-Received: by 2002:a19:6a10:: with SMTP id u16mr1770666lfu.105.1588427290372; Sat, 02 May 2020 06:48:10 -0700 (PDT) Received: from guixsd (ppp91-122-124-75.pppoe.avangarddsl.ru. [91.122.124.75]) by smtp.gmail.com with ESMTPSA id t3sm3879013ljo.51.2020.05.02.06.48.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 06:48:09 -0700 (PDT) From: Oleg Pykhalov References: <20200502111908.26a8e396@airmail.cc> Date: Sat, 02 May 2020 16:47:38 +0300 In-Reply-To: <20200502111908.26a8e396@airmail.cc> (pinoaffe@airmail.cc's message of "Sat, 2 May 2020 11:19:46 +0200") Message-ID: <87ees2la85.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, Thank you for the patch! pinoaffe writes: > * doc/guix.texi: Add documentation. > * gnu/services/ssh.scm (): New record type. > (mpd-service-type): New service type. > --- > doc/guix.texi | 75 +++++++++++++++++++++++++++++ > gnu/services/ssh.scm | 109 ++++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 183 insertions(+), 1 deletion(-) > > diff --git a/doc/guix.texi b/doc/guix.texi > index c571010bc8..f88859c584 100644 > --- a/doc/guix.texi > +++ b/doc/guix.texi […] > +@lisp > +(autossh (autossh-configuration > + (user "pino") > + (ssh-options (list "-T" "-N" "-L" "8081:localhost:8081" "remote.net")))) > +@end lisp > +@end deffn --8<---------------cut here---------------start------------->8--- (service autossh-service-type (autossh-configuration (user "pino") (ssh-options (list "-T" "-N" "-L" "8081:localhost:8081" "remote.net")))) --8<---------------cut here---------------end--------------->8--- […] > diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm > index d2dbb8f80d..ec0150b3a2 100644 > --- a/gnu/services/ssh.scm > +++ b/gnu/services/ssh.scm […] > +(define (autossh-service-activation config) > + (with-imported-modules '((guix build utils)) > + #~(begin > + (use-modules (guix build utils)) > + (define %user > + (getpw #$(autossh-configuration-user config))) > + (let ((directory #$(autossh-file-name config ""))) > + (mkdir-p directory) > + (chown directory (passwd:uid %user) (passwd:gid %user)))))) I cannot start the service in a testing vm because of log file is owner by root. The following fixes this. Also, why don't you put the log in /var/log directory? Oleg. diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index ec0150b3a2..c111437b1a 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -715,9 +715,12 @@ object." (use-modules (guix build utils)) (define %user (getpw #$(autossh-configuration-user config))) - (let ((directory #$(autossh-file-name config ""))) + (let* ((directory #$(autossh-file-name config "")) + (log (string-append directory "/log"))) (mkdir-p directory) - (chown directory (passwd:uid %user) (passwd:gid %user)))))) + (chown directory (passwd:uid %user) (passwd:gid %user)) + (call-with-output-file log (const #t)) + (chown log (passwd:uid %user) (passwd:gid %user)))))) (define autossh-service-type (service-type