diff mbox

pre-release [PATCH] git-service

Message ID 87zipsgm8g.fsf@we.make.ritual.n0.is
State New
Headers show

Commit Message

non such July 8, 2016, 3:53 p.m. UTC
I need some feedback on the git-service.
The inserted patch gives me this output:

ng0@shadowwalker ~/guix-git-service$ ./pre-inst-env guix system
vm ~/testvm.scm
Backtrace:
In ice-9/boot-9.scm:
1724: 19 [%start-stack load-stack ...]
1729: 18 [#<procedure 19ceea0 ()>]
In unknown file:
?: 17 [primitive-load
"/home/ng0/guix-git-service/scripts/guix"]
In guix/ui.scm:
1209: 16 [run-guix-command system "vm" "/home/ng0/testvm.scm"]
In ice-9/boot-9.scm:
157: 15 [catch srfi-34 #<procedure 457dd20 at
guix/ui.scm:425:2 ()> ...]
157: 14 [catch system-error ...]
In guix/scripts/system.scm:
882: 13 [#<procedure 4580ed0 at
guix/scripts/system.scm:874:2 ()>]
788: 12 [process-action vm ("/home/ng0/testvm.scm") ...]
In guix/store.scm:
1182: 11 [run-with-store # ...]
In guix/scripts/system.scm:
800: 10 [#<procedure 458ae40 at
guix/scripts/system.scm:792:8 (state)> #]
564: 9 [perform-action vm # # ...]
In gnu/system/vm.scm:
496: 8 [system-qemu-image/shared-store-script # # #
...]
In gnu/system.scm:
601: 7 [operating-system-derivation # # #f]
In gnu/services.scm:
601: 6 [loop #]
In srfi/srfi-1.scm:
578: 5 [map #<procedure 4a00a00 at
gnu/services.scm:590:4 (service)> (# # #)]
In gnu/services.scm:
463: 4 [packages->profile-entry (# # # # ...)]
In guix/profiles.scm:
187: 3 [packages->manifest (# # # # ...)]
In srfi/srfi-1.scm:
576: 2 [map #<procedure 2278ce0 at
guix/profiles.scm:188:8 (expr)> (# # # # ...)]
In guix/profiles.scm:
174: 1 [package->manifest-entry # #f]
In guix/packages.scm:
638: 0 [package-transitive-propagated-inputs #]

guix/packages.scm:638:21: In procedure
package-transitive-propagated-inputs:
guix/packages.scm:638:21: In procedure
%package-propagated-inputs-real: Wrong type argument:
#<<git-configuration> git: #<package git@2.9.0
gnu/packages/version-control.scm:113 39349c0> base-path:
"/var/git/repositories" port: 9418>




From bfff0a190b51deca3849738310f03f2289f10881 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Fri, 8 Jul 2016 15:42:55 +0000
Subject: [PATCH] gnu: services: Add git-service.

* gnu/services/version-control.scm: New file,
create it.
(git-service): New Procedures.
(git-service-type): New variable.
---
 gnu/local.mk                     |   1 +
 gnu/services/version-control.scm | 110 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 gnu/services/version-control.scm

--
2.9.0


--
♥Ⓐ  ng0
For non-prism friendly talk find me on http://www.psyced.org
SecuShare – http://secushare.org

Comments

David Thompson July 8, 2016, 6:24 p.m. UTC | #1
On Fri, Jul 8, 2016 at 11:53 AM, ng0 <ng0@we.make.ritual.n0.is> wrote:
> I need some feedback on the git-service.
> The inserted patch gives me this output:
>
>
> +(define-record-type* <git-configuration>
> +  git-configuration make-git-configuration
> +  git-configuration?
> +  (git       git-configuration-git ; <package>
> +             (default git))
> +  (base-path git-configuration-base-path) ; string
> +  (port      git-configuration-port)) ; string

So, this is a record type...

> +
> +(define git-shepherd-service
> +  (match-lambda
> +    (($ <git-configuration> git base-path port)
> +     (let ((conf (string-append
> +                  "--base-path="base-path
> +                  "--port="(number->string port))))
> +       (list (shepherd-service
> +              (provision '(git))
> +              (requirement '(networking loopback syslogd))
> +              (documentation "Run the git-daemon server for git repositories")
> +              (start #~(make-forkexec-constructor
> +                        (list (string-append #$git "/bin/git")
> +                              "daemon" "--syslog" "--informative-errors"
> +                              #$conf)))

...and you (ungexp conf), where conf is an instance of that record
type, into what is supposed to be a list of strings that form command
line arguments for git.  See the issue?

> +              (stop #~(make-kill-destructor))))))))

- Dave
Ricardo Wurmus July 8, 2016, 8:41 p.m. UTC | #2
Thompson, David <dthompson2@worcester.edu> writes:

> On Fri, Jul 8, 2016 at 11:53 AM, ng0 <ng0@we.make.ritual.n0.is> wrote:
>> I need some feedback on the git-service.
>> The inserted patch gives me this output:
>>
>>
>> +(define-record-type* <git-configuration>
>> +  git-configuration make-git-configuration
>> +  git-configuration?
>> +  (git       git-configuration-git ; <package>
>> +             (default git))
>> +  (base-path git-configuration-base-path) ; string
>> +  (port      git-configuration-port)) ; string
>
> So, this is a record type...
>
>> +
>> +(define git-shepherd-service
>> +  (match-lambda
>> +    (($ <git-configuration> git base-path port)
>> +     (let ((conf (string-append
>> +                  "--base-path="base-path
>> +                  "--port="(number->string port))))
>> +       (list (shepherd-service
>> +              (provision '(git))
>> +              (requirement '(networking loopback syslogd))
>> +              (documentation "Run the git-daemon server for git repositories")
>> +              (start #~(make-forkexec-constructor
>> +                        (list (string-append #$git "/bin/git")
>> +                              "daemon" "--syslog" "--informative-errors"
>> +                              #$conf)))
>
> ...and you (ungexp conf), where conf is an instance of that record
> type, into what is supposed to be a list of strings that form command
> line arguments for git.  See the issue?

I might be misreading this, but “conf” here is literally the string

    “--base-path=something--port=1234”

when “base-path” is the string “something” and “port” is the number
“1234”.

The let binding for “conf” is incorrect.

First, you say earlier that “port” is a string:

> +  (port      git-configuration-port)) ; string

but then you pass it to “number->string”, so it’s actually expected to
be a number.

Second, the argument to “make-forkexec-constructor” is supposed to be a
list of strings, each representing one argument.  So defining “conf” as
a concatenation is not okay.  You don’t need a let-binding for “conf” at
all.  Just use “base-path” and “port” directly.  (I haven’t tested
this.)

    (list (string-append #$git "/bin/git")
          "daemon" "--syslog" "--informative-errors"
          (string-append "--base-path=" $#base-path)
          (string-append "--port=" $#port))

But the error you get stems from passing a value of
“<git-configuration>” to something that expects a package.  I don’t see
where this happens.  Since I cannot see “~/testvm.scm” I cannot tell you
anything more.

~~ Ricardo
non such July 9, 2016, 1:08 a.m. UTC | #3
Ricardo Wurmus <rekado@elephly.net> writes:

> Thompson, David <dthompson2@worcester.edu> writes:
>
>> On Fri, Jul 8, 2016 at 11:53 AM, ng0 <ng0@we.make.ritual.n0.is> wrote:
>>> I need some feedback on the git-service.
>>> The inserted patch gives me this output:
>>>
>>>
>>> +(define-record-type* <git-configuration>
>>> +  git-configuration make-git-configuration
>>> +  git-configuration?
>>> +  (git       git-configuration-git ; <package>
>>> +             (default git))
>>> +  (base-path git-configuration-base-path) ; string
>>> +  (port      git-configuration-port)) ; string
>>
>> So, this is a record type...
>>
>>> +
>>> +(define git-shepherd-service
>>> +  (match-lambda
>>> +    (($ <git-configuration> git base-path port)
>>> +     (let ((conf (string-append
>>> +                  "--base-path="base-path
>>> +                  "--port="(number->string port))))
>>> +       (list (shepherd-service
>>> +              (provision '(git))
>>> +              (requirement '(networking loopback syslogd))
>>> +              (documentation "Run the git-daemon server for git repositories")
>>> +              (start #~(make-forkexec-constructor
>>> +                        (list (string-append #$git "/bin/git")
>>> +                              "daemon" "--syslog" "--informative-errors"
>>> +                              #$conf)))
>>
>> ...and you (ungexp conf), where conf is an instance of that record
>> type, into what is supposed to be a list of strings that form command
>> line arguments for git.  See the issue?
>
> I might be misreading this, but “conf” here is literally the string
>
>     “--base-path=something--port=1234”
>
> when “base-path” is the string “something” and “port” is the number
> “1234”.
>
> The let binding for “conf” is incorrect.
>
> First, you say earlier that “port” is a string:
>
>> +  (port      git-configuration-port)) ; string
>
> but then you pass it to “number->string”, so it’s actually expected to
> be a number.
>
> Second, the argument to “make-forkexec-constructor” is supposed to be a
> list of strings, each representing one argument.  So defining “conf” as
> a concatenation is not okay.  You don’t need a let-binding for “conf” at
> all.  Just use “base-path” and “port” directly.  (I haven’t tested
> this.)
>
>     (list (string-append #$git "/bin/git")
>           "daemon" "--syslog" "--informative-errors"
>           (string-append "--base-path=" $#base-path)
>           (string-append "--port=" $#port))
>
> But the error you get stems from passing a value of
> “<git-configuration>” to something that expects a package.  I don’t see
> where this happens.  Since I cannot see “~/testvm.scm” I cannot tell you
> anything more.
>
> ~~ Ricardo
>

I just came back, I'll look at everything else tomorrow. Thanks
for the replies so far!

This is the testvm.scm:

(use-modules (gnu) (gnu system nss))
(use-service-modules desktop networking ssh version-control dbus avahi xorg)
(use-package-modules certs)
(use-package-modules tor emacs xorg version-control avahi xorg ssh)

(operating-system
  (host-name "testvm")
  (timezone "UTC")
  (locale "en_US.UTF-8")

  (bootloader (grub-configuration (device "/dev/sda")))
  (file-systems
   (list (file-system
          (mount-point "/")
          (device "dummy")
          (type "dummy"))
         %binary-format-file-system))

  (users (list (user-account
                (name "ng0")
                (comment "")
                (group "users")
                (supplementary-groups '("wheel" "netdev"
                                        "audio" "video"))
                (home-directory "/home/ng0")
                (password ""))))

  (services (cons* (slim-service #:auto-login? #t
                                 #:default-user "ng0")
                   (console-keymap-service "de-latin1")
                   (static-networking-service "eth0" "10.0.2.10"
                                              #:name-servers '("10.0.2.3")
                                              #:gateway "10.0.2.2")
                   ;;(avahi-service)
                   ;;(dbus-service (list avahi))
                   (git-service)
                   %base-services))
  (pam-services
   (base-pam-services #:allow-empty-passwords? #t))

  (packages (cons* emacs openssh git xterm
                   avahi findutils grep which xmodmap
                   %base-packages)))
non such July 13, 2016, 10:23 a.m. UTC | #4
Hi,

thanks to you both for your help!

Ricardo Wurmus <rekado@elephly.net> writes:

> Thompson, David <dthompson2@worcester.edu> writes:
>
>> On Fri, Jul 8, 2016 at 11:53 AM, ng0 <ng0@we.make.ritual.n0.is> wrote:
>>> I need some feedback on the git-service.
>>> The inserted patch gives me this output:
>>>
>>>
>>> +(define-record-type* <git-configuration>
>>> +  git-configuration make-git-configuration
>>> +  git-configuration?
>>> +  (git       git-configuration-git ; <package>
>>> +             (default git))
>>> +  (base-path git-configuration-base-path) ; string
>>> +  (port      git-configuration-port)) ; string
>>
>> So, this is a record type...
>>
>>> +
>>> +(define git-shepherd-service
>>> +  (match-lambda
>>> +    (($ <git-configuration> git base-path port)
>>> +     (let ((conf (string-append
>>> +                  "--base-path="base-path
>>> +                  "--port="(number->string port))))
>>> +       (list (shepherd-service
>>> +              (provision '(git))
>>> +              (requirement '(networking loopback syslogd))
>>> +              (documentation "Run the git-daemon server for git repositories")
>>> +              (start #~(make-forkexec-constructor
>>> +                        (list (string-append #$git "/bin/git")
>>> +                              "daemon" "--syslog" "--informative-errors"
>>> +                              #$conf)))
>>
>> ...and you (ungexp conf), where conf is an instance of that record
>> type, into what is supposed to be a list of strings that form command
>> line arguments for git.  See the issue?

With the additional input Ricardo gave it's clearer now.

>
> I might be misreading this, but “conf” here is literally the string
>
>     “--base-path=something--port=1234”
>
> when “base-path” is the string “something” and “port” is the number
> “1234”.
>
> The let binding for “conf” is incorrect.
>
> First, you say earlier that “port” is a string:
>
>> +  (port      git-configuration-port)) ; string
>
> but then you pass it to “number->string”, so it’s actually expected to
> be a number.
>
> Second, the argument to “make-forkexec-constructor” is supposed to be a
> list of strings, each representing one argument.  So defining “conf” as
> a concatenation is not okay.  You don’t need a let-binding for “conf” at
> all.  Just use “base-path” and “port” directly.  (I haven’t tested
> this.)
>
>     (list (string-append #$git "/bin/git")
>           "daemon" "--syslog" "--informative-errors"
>           (string-append "--base-path=" $#base-path)
>           (string-append "--port=" $#port))
>
> But the error you get stems from passing a value of
> “<git-configuration>” to something that expects a package.  I don’t see
> where this happens.  Since I cannot see “~/testvm.scm” I cannot tell you
> anything more.
>
> ~~ Ricardo
>

I based this on information sourced from other services, and some
parts (the service field and the shepherd-service) are just
testing out what is expected and what's not.

I feel like your information and what I need to read up on helps
alot.

thanks.
diff mbox

Patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 947d1b0..eb0fd9a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -384,6 +384,7 @@  GNU_SYSTEM_MODULES =				\
   %D%/services/shepherd.scm			\
   %D%/services/herd.scm				\
   %D%/services/ssh.scm				\
+  %D%/services/version-control.scm              \
   %D%/services/web.scm				\
   %D%/services/xorg.scm				\
 						\
diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm
new file mode 100644
index 0000000..ad41afc
--- /dev/null
+++ b/gnu/services/version-control.scm
@@ -0,0 +1,110 @@ 
+ ;;; GNU Guix --- Functional package management for GNU
+ ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+ ;;;
+ ;;; 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 <http://www.gnu.org/licenses/>.
+
+(define-module (gnu services version-control)
+  #:use-module (gnu services)
+  #:use-module (gnu services base)
+  #:use-module (gnu services shepherd)
+  #:use-module (gnu system shadow)
+  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages admin)
+  #:use-module (guix records)
+  #:use-module (guix gexp)
+  #:use-module (ice-9 match)
+  #:export (git-service
+            git-service-type))
+
+;;; Commentary:
+;;;
+;;; Version Control related services.
+;;;
+;;; Code:
+
+
+;;;
+;;; git
+;;;
+
+(define-record-type* <git-configuration>
+  git-configuration make-git-configuration
+  git-configuration?
+  (git       git-configuration-git ; <package>
+             (default git))
+  (base-path git-configuration-base-path) ; string
+  (port      git-configuration-port)) ; string
+
+
+(define git-shepherd-service
+  (match-lambda
+    (($ <git-configuration> git base-path port)
+     (let ((conf (string-append
+                  "--base-path="base-path
+                  "--port="(number->string port))))
+       (list (shepherd-service
+              (provision '(git))
+              (requirement '(networking loopback syslogd))
+              (documentation "Run the git-daemon server for git repositories")
+              (start #~(make-forkexec-constructor
+                        (list (string-append #$git "/bin/git")
+                              "daemon" "--syslog" "--informative-errors"
+                              #$conf)))
+              (stop #~(make-kill-destructor))))))))
+
+(define %git-accounts
+  ;; User account and groups for git-daemon.
+  (list (user-group (name "git") (system? #t))
+        (user-account
+         (name "git")
+         (group "git")
+         (system? #t)
+         (comment "git-daemon user")
+         (home-directory "/var/git")
+         (shell #~(string-append #$shadow "/sbin/nologin")))))
+
+(define %git-activation
+  ;; Activation gexp.
+  #~(begin (use-modules (guix build utils))
+           (mkdir-p "/var/run/git-daemon")))
+
+(define git-service-type
+  (service-type
+   (name 'git)
+   (extensions
+    (list (service-extension shepherd-root-service-type
+                             git-shepherd-service)
+          (service-extension activation-service-type
+                             (const %git-activation))
+          ;; Add git-daemon to the global profile.
+          (service-extension profile-service-type list)))))
+
+(define* (git-service #:key
+                      (git git)
+                      (base-path "/var/git/repositories")
+                      (port 9418))
+  "Return a service that runs @url{https://git-scm.org,git} as a daemon,
+ etc...
+
+ The daemon will listen on the port specified in @var{port}.
+
+ In addition, @var{extra-settings} specifies a string to append to the
+ daemon parameters."
+  (service git-service-type
+           (git-configuration
+            (git git)
+            (base-path base-path)
+            (port port))))