From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dunMg-0000GE-6B for guix-patches@gnu.org; Wed, 20 Sep 2017 18:21:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dunMc-0004ZE-NI for guix-patches@gnu.org; Wed, 20 Sep 2017 18:21:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:41968) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dunMc-0004YW-Hq for guix-patches@gnu.org; Wed, 20 Sep 2017 18:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dunMc-00087P-Aq for guix-patches@gnu.org; Wed, 20 Sep 2017 18:21:02 -0400 Subject: [bug#28283] Status: [PATCH 1/1] gnu: services: version-control: Add cgit. Resent-Message-ID: From: Oleg Pykhalov References: <87h8wq2hxw.fsf@gmail.com> <87a82i2hur.fsf@gmail.com> <873787rh4a.fsf@gnu.org> <87d16mv0o3.fsf@gnu.org> Date: Thu, 21 Sep 2017 01:20:11 +0300 In-Reply-To: <87d16mv0o3.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 19 Sep 2017 23:27:56 +0200") Message-ID: <87efr19fms.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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: 28283@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello Ludovic, apologies for long responce. ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Hello Oleg, > > This patch fell through the cracks. :-) > > Could you look into the comments I made below and send updated patches? > We=E2=80=99re almost there! Yes, I looked them already few days ago. Your last comment was about nginx changes. I'm working on it. But I have issue with stucture when I try to test. --8<---------------cut here---------------start------------->8--- natsu@magnolia ~/src/guix$ guix environment guix -- make check-system TESTS= =3Dnginx ;;; note: source file /home/natsu/src/guix-wigust/wigust/packages/emacs.scm ;;; newer than compiled /home/natsu/.cache/guile/ccache/2.2-LE-8-3.A/= home/natsu/src/guix-wigust/wigust/packages/emacs.scm.go substitute: updating list of substitutes from 'https://berlin.guixsd.org'..= . 100.0% Compiling Scheme modules... warning: failed to load '(gnu tests web)': ERROR: In procedure allocate-struct: Wrong type argument in position 2: 9 Running 0 system tests... TOTAL: 0 --8<---------------cut here---------------end--------------->8--- --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 4aa6fd501..3063bd549 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -99,6 +99,8 @@ (default '())) (index nginx-server-configuration-index (default (list "index.html"))) + (try-files nginx-server-configuration-try-files + (default '())) (ssl-certificate nginx-server-configuration-ssl-certificate (default "/etc/nginx/cert.pem")) (ssl-certificate-key nginx-server-configuration-ssl-certificate-key @@ -179,6 +181,7 @@ of index files." (nginx-server-configuration-ssl-certificate-key server)) (root (nginx-server-configuration-root server)) (index (nginx-server-configuration-index server)) + ;; (try-files (nginx-server-configuration-try-files server)) (server-tokens? (nginx-server-configuration-server-tokens? server)) (locations (nginx-server-configuration-locations server))) (define-syntax-parameter <> (syntax-rules ())) @@ -207,6 +210,10 @@ of index files." (and/l ssl-certificate-key " ssl_certificate_key " <> ";\n") " root " root ";\n" " index " (config-index-strings index) ";\n" + ;; (if (nil? (pk 'try-files try-files)) + ;; "" + ;; (string append " try_files " + ;; (config-index-strings try-files) ";\n")) " server_tokens " (if server-tokens? "on" "off") ";\n" "\n" (map emit-nginx-location-config locations) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable > Ludo=E2=80=99. > > ludo@gnu.org (Ludovic Court=C3=A8s) skribis: > >> Hi Oleg, >> >> Oleg Pykhalov skribis: >> >>> From 65fa66cd761f3a9f8c6e84f8b5f7d8c643fe9731 Mon Sep 17 00:00:00 2001 >>> From: Oleg Pykhalov >>> Date: Tue, 29 Aug 2017 23:40:05 +0300 >>> Subject: [PATCH 1/1] gnu: services: version-control: Add cgit. >>> >>> * gnu/services/version-control.scm >>> (, ): New record types. >>> (cgit-configuration-robots-string, cgit-activation, >>> cgit-configuration-nginx-config): New procedures. >>> (%cgit-configuration-nginx, cgit-service-type): New variables. >>> * doc/guix.texi (Version Control): Document the cgit service. >>> * gnu/services/web.scm (): Add >>> nginx-server-configuration-try-files. >>> (emit-nginx-server-config): Add this. >> >> That looks nice and useful! >> >> Minor issues: >> >>> +@subsubheading cgit service >> >> Please capitalize titles: =E2=80=9CCgit Service=E2=80=9D >> >>> +@uref{https://git.zx2c4.com/cgit/, cgit} is a hyperfast web >>> +frontend for git repositories written in C. >> >> =E2=80=9CGit=E2=80=9D, not =E2=80=9Cgit=E2=80=9D. Also, not hypersuperl= atives please. :-) >> >> So what about this: >> >> @uref{https://git.zx2c4.com/cgit/, cgit} is a Web interface to Git >> repositories, written in C. It allows users to look at Git >> repository contents and history through their Web browsers. >> >>> +The following example will configure the service with default values. >>> +By default, cgit can be accessed on port 80 (@code{http://localhost:80= }). >>> + >>> +@example >>> +(service nginx-service-type) >>> +(service fcgiwrap-service-type) >>> +(service cgit-service-type) >>> +@end example >> >> Please add a sentence above or below the example like =E2=80=9CThis exam= ple >> shows =E2=80=A6=E2=80=9D. >> >>> +@table @asis >>> +@item @code{css} (default: @code{"/share/cgit/cgit.css"}) >>> +Url which specifies the css document to include in all cgit pages. >>> + >>> +@item @code{logo} (default: @code{"/share/cgit/cgit.png"}) >>> +Url which specifies the source of an image which will be used as a logo >>> +on all cgit pages. >>> + >>> +@item @code{virtual-root} (default: @code{"/"}) >>> +Url which, if specified, will be used as root for all cgit links. >> >> s/Url/URL/ >> >>> +@item @code{scan-path} (default: @code{"/srv/git"}) >>> +A path which will be scanned for repositories. >> >> Rather: =E2=80=9CName of the directory to scan for repositories.=E2=80=9D >> >> Can you also rename =E2=80=98scan-path=E2=80=99 to =E2=80=98repository-d= irectory=E2=80=99 or something >> like that? (Not =E2=80=9Cpath.=E2=80=9D) >> >>> +@item @code{robots} (default: @code{(list "noindex" "nofollow")}) >>> +Text used as content for the "robots" meta-tag. >> >> Write ``robots'' (literally) so that Texinfo typesets things correctly. >> >>> --- a/gnu/services/web.scm >>> +++ b/gnu/services/web.scm >>> @@ -99,6 +99,8 @@ >>> (default '())) >>> (index nginx-server-configuration-index >>> (default (list "index.html"))) >>> + (try-files nginx-server-configuration-try-files >>> + (default #f)) >>> (ssl-certificate nginx-server-configuration-ssl-certificate >>> (default "/etc/nginx/cert.pem")) >>> (ssl-certificate-key nginx-server-configuration-ssl-certificate-key >>> @@ -179,6 +181,7 @@ of index files." >>> (nginx-server-configuration-ssl-certificate-key server)) >>> (root (nginx-server-configuration-root server)) >>> (index (nginx-server-configuration-index server)) >>> + (try-files (nginx-server-configuration-try-files server)) >>> (server-tokens? (nginx-server-configuration-server-tokens? ser= ver)) >>> (locations (nginx-server-configuration-locations server))) >>> (define-syntax-parameter <> (syntax-rules ())) >>> @@ -207,6 +210,7 @@ of index files." >>> (and/l ssl-certificate-key " ssl_certificate_key " <> ";\n") >>> " root " root ";\n" >>> " index " (config-index-strings index) ";\n" >>> + " try_files " (config-index-strings try-files) ";\n" >>> " server_tokens " (if server-tokens? "on" "off") ";\n" >>> "\n" >>> (map emit-nginx-location-config locations) >> >> Could you submit these nginx changes separately for discussion? We=E2= =80=99ll >> also need to document them. Maybe Cc Chris Baines and other nginx >> people. >> >> Thanks! >> >> Ludo=E2=80=99. --=-=-=--