From patchwork Tue Mar 30 21:34:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 28203 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 F15E527BC66; Tue, 30 Mar 2021 22:35:27 +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,SPF_HELO_PASS,UNPARSEABLE_RELAY 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 961FF27BC65 for ; Tue, 30 Mar 2021 22:35:27 +0100 (BST) Received: from localhost ([::1]:55370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRM1G-0004kp-KN for patchwork@mira.cbaines.net; Tue, 30 Mar 2021 17:35:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRM0t-0004jK-5G for guix-patches@gnu.org; Tue, 30 Mar 2021 17:35:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41446) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRM0s-0001OV-Sj for guix-patches@gnu.org; Tue, 30 Mar 2021 17:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRM0s-00062B-Pt for guix-patches@gnu.org; Tue, 30 Mar 2021 17:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47504] [PATCH 1/2] gnu: services: web: Cleanup whitespace. References: <871rbw1ga2.fsf@cbaines.net> In-Reply-To: <871rbw1ga2.fsf@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Mar 2021 21:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47504 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47504@debbugs.gnu.org Received: via spool by 47504-submit@debbugs.gnu.org id=B47504.161714008723161 (code B ref 47504); Tue, 30 Mar 2021 21:35:02 +0000 Received: (at 47504) by debbugs.gnu.org; 30 Mar 2021 21:34:47 +0000 Received: from localhost ([127.0.0.1]:52989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRM0b-00061T-18 for submit@debbugs.gnu.org; Tue, 30 Mar 2021 17:34:46 -0400 Received: from mira.cbaines.net ([212.71.252.8]:35914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRM0U-000615-VS for 47504@debbugs.gnu.org; Tue, 30 Mar 2021 17:34:41 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id 5535527BC65 for <47504@debbugs.gnu.org>; Tue, 30 Mar 2021 22:34:37 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 50686dbb for <47504@debbugs.gnu.org>; Tue, 30 Mar 2021 21:34:37 +0000 (UTC) From: Christopher Baines Date: Tue, 30 Mar 2021 22:34:36 +0100 Message-Id: <20210330213437.23503-1-mail@cbaines.net> X-Mailer: git-send-email 2.30.1 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 Replace tabs with spaces, and delete trailing whitespace. * gnu/services/web.scm: Cleanup whitespace. --- gnu/services/web.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index aa688a4328..1aad695c8b 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -840,8 +840,8 @@ of index files." (requirement '(networking)) (start #~(make-forkexec-constructor '(#$(file-append package "/sbin/fcgiwrap") - "-s" #$socket) - #:user #$user #:group #$group)) + "-s" #$socket) + #:user #$user #:group #$group)) (stop #~(make-kill-destructor))))))) (define fcgiwrap-activation @@ -863,7 +863,7 @@ of index files." (extensions (list (service-extension shepherd-root-service-type fcgiwrap-shepherd-service) - (service-extension account-service-type + (service-extension account-service-type fcgiwrap-accounts) (service-extension activation-service-type fcgiwrap-activation))) @@ -1946,24 +1946,24 @@ root=/srv/gemini (documentation "Run the agate Gemini server.") (start (let ((agate (file-append package "/bin/agate"))) #~(make-forkexec-constructor - (list #$agate - "--content" #$content - "--cert" #$cert - "--key" #$key - "--addr" #$@addr + (list #$agate + "--content" #$content + "--cert" #$cert + "--key" #$key + "--addr" #$@addr #$@(if lang (list "--lang" lang) '()) - #$@(if hostname - (list "--hostname" hostname) - '()) - #$@(if silent? '("--silent") '()) - #$@(if serve-secret? '("--serve-secret") '()) - #$@(if log-ip? '("--log-ip") '())) - #:user #$user #:group #$group - #:log-file #$log-file))) + #$@(if hostname + (list "--hostname" hostname) + '()) + #$@(if silent? '("--silent") '()) + #$@(if serve-secret? '("--serve-secret") '()) + #$@(if log-ip? '("--log-ip") '())) + #:user #$user #:group #$group + #:log-file #$log-file))) (stop #~(make-kill-destructor))))))) - + (define agate-accounts (match-lambda (($ _ _ _ _ _