From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBoN5-0007b8-MG for guix-patches@gnu.org; Thu, 26 Apr 2018 17:24:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBoN0-00076v-Oc for guix-patches@gnu.org; Thu, 26 Apr 2018 17:24:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:32856) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fBoN0-00076r-Lf for guix-patches@gnu.org; Thu, 26 Apr 2018 17:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fBoN0-0001Vc-DH for guix-patches@gnu.org; Thu, 26 Apr 2018 17:24:02 -0400 Subject: [bug#31277] [PATCH 2/3] services: cgit: Improve handling of extra-options. Resent-Message-ID: From: Christopher Baines Date: Thu, 26 Apr 2018 22:23:08 +0100 Message-Id: <20180426212309.10809-2-mail@cbaines.net> In-Reply-To: <20180426212309.10809-1-mail@cbaines.net> References: <20180426212309.10809-1-mail@cbaines.net> 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: 31277@debbugs.gnu.org * gnu/services/cgit.scm (serialize-cgit-configuration): Add the extra options, one per line, before the scan-path, as this makes it possible to use the extra-options to affect the global behaviour for repositories. --- gnu/services/cgit.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/services/cgit.scm b/gnu/services/cgit.scm index 8ef12cd5a..bacd6ca16 100644 --- a/gnu/services/cgit.scm +++ b/gnu/services/cgit.scm @@ -642,13 +642,19 @@ for cgit to allow access to that repository.") (not (memq (configuration-field-name field) '(project-list repository-directory - repositories)))) + repositories + extra-options)))) #~(string-append #$(let ((rest (filter rest? cgit-configuration-fields))) (serialize-configuration config rest)) #$(serialize-project-list 'project-list (cgit-configuration-project-list config)) + #$(string-join + (append + (cgit-configuration-extra-options config) + '("")) + "\n") #$(serialize-repository-directory 'repository-directory (cgit-configuration-repository-directory config)) -- 2.17.0