diff options
| author | Alex Kost <alezost@gmail.com> | 2016-01-27 23:02:31 +0300 |
|---|---|---|
| committer | Alex Kost <alezost@gmail.com> | 2016-01-29 20:21:53 +0300 |
| commit | d4053c710bc2c7a4f624ba2d72438d8f289ad569 (patch) | |
| tree | a07276cb148dbb778082b9986940a5d69ac830b0 /gnu/services/ssh.scm | |
| parent | 26b94866ad18666e1e427f3377ad21b8532cc3fb (diff) | |
services: Rename 'dmd' services to 'shepherd'.
* gnu/services/shepherd.scm (dmd-root-service-type, %dmd-root-service)
(dmd-service-type, <dmd-service>, dmd-service, dmd-service?)
(make-dmd-service, dmd-service-documentation, dmd-service-provision)
(dmd-service-requirement, dmd-service-respawn, dmd-service-start)
(dmd-service-stop, dmd-service-auto-start?, dmd-service-modules)
(dmd-service-imported-modules, dmd-service-file-name, dmd-service-file)
(dmd-service-back-edges): Rename to...
(shepherd-root-service-type, %shepherd-root-service, shepherd-service-type)
(<shepherd-service>, shepherd-service, shepherd-service?)
(make-shepherd-service, shepherd-service-documentation)
(shepherd-service-provision, shepherd-service-requirement)
(shepherd-service-respawn, shepherd-service-start)
(shepherd-service-stop, shepherd-service-auto-start?)
(shepherd-service-modules, shepherd-service-imported-modules)
(shepherd-service-file-name, shepherd-service-file)
(shepherd-service-back-edges): ...this
* gnu/services.scm: Adjust comments.
* gnu/services/avahi.scm (avahi-dmd-service): Rename to...
(avahi-shepherd-service): ... this.
* gnu/services/base.scm (%root-file-system-dmd-service)
(file-system->dmd-service-name, mapped-device->dmd-service-name)
(dependency->dmd-service-name, file-system-dmd-service)
(mingetty-dmd-service, nscd-dmd-service, guix-dmd-service)
(guix-publish-dmd-service, udev-dmd-service, gpm-dmd-service): Rename to...
(%root-file-system-shepherd-service)
(file-system->shepherd-service-name, mapped-device->shepherd-service-name)
(dependency->shepherd-service-name, file-system-shepherd-service)
(mingetty-shepherd-service, nscd-shepherd-service, guix-shepherd-service)
(guix-publish-shepherd-service, udev-shepherd-service)
(gpm-shepherd-service): ... this.
* gnu/services/databases.scm (postgresql-dmd-service): Rename to...
(postgresql-shepherd-service): ... this.
* gnu/services/desktop.scm (upower-dmd-service, elogind-dmd-service):
Rename to...
(upower-shepherd-service, elogind-shepherd-service): ... this.
* gnu/services/dbus.scm (dbus-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/lirc.scm (lirc-dmd-service): Rename to...
(lirc-shepherd-service): ... this.
* gnu/services/mail.scm (dovecot-dmd-service): Rename to...
(dovecot-shepherd-service): ... this.
* gnu/services/networking.scm (ntp-dmd-service, tor-dmd-service)
(bitlbee-dmd-service, wicd-dmd-service, network-manager-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/ssh.scm (lsh-dmd-service): Rename to...
(lsh-shepherd-service): ... this.
* gnu/services/web.scm (nginx-dmd-service): Rename to...
(nginx-shepherd-service): ... this.
* gnu/services/xorg.scm (slim-dmd-service): Rename to...
(slim-shepherd-service): ... this.
* gnu/system.scm (essential-services): Use '%shepherd-root-service'.
* gnu/system/install.scm (cow-store-service-type): Adjust accordingly.
* guix/scripts/system.scm (dmd-service-node-label, dmd-service-node-type)
(export-dmd-graph): Likewise.
* tests/guix-system.sh: Likewise.
* tests/services.scm ("dmd-service-back-edges"): Rename to...
("shepherd-service-back-edges"): Adjust accordingly.
* doc/guix.texi: Likewise.
* doc/images/service-graph.dot: Use 'shepherd' service name.
Diffstat (limited to 'gnu/services/ssh.scm')
| -rw-r--r-- | gnu/services/ssh.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index d6365023cef..33e1951a6e7 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm | |||
| @@ -103,8 +103,8 @@ | |||
| 103 | (lsh-configuration-host-key config)) | 103 | (lsh-configuration-host-key config)) |
| 104 | #t))) | 104 | #t))) |
| 105 | 105 | ||
| 106 | (define (lsh-dmd-service config) | 106 | (define (lsh-shepherd-service config) |
| 107 | "Return a <dmd-service> for lsh with CONFIG." | 107 | "Return a <shepherd-service> for lsh with CONFIG." |
| 108 | (define lsh (lsh-configuration-lsh config)) | 108 | (define lsh (lsh-configuration-lsh config)) |
| 109 | (define pid-file (lsh-configuration-pid-file config)) | 109 | (define pid-file (lsh-configuration-pid-file config)) |
| 110 | (define pid-file? (lsh-configuration-pid-file? config)) | 110 | (define pid-file? (lsh-configuration-pid-file? config)) |
| @@ -151,7 +151,7 @@ | |||
| 151 | '(networking syslogd) | 151 | '(networking syslogd) |
| 152 | '(networking))) | 152 | '(networking))) |
| 153 | 153 | ||
| 154 | (list (dmd-service | 154 | (list (shepherd-service |
| 155 | (documentation "GNU lsh SSH server") | 155 | (documentation "GNU lsh SSH server") |
| 156 | (provision '(ssh-daemon)) | 156 | (provision '(ssh-daemon)) |
| 157 | (requirement requires) | 157 | (requirement requires) |
| @@ -168,8 +168,8 @@ | |||
| 168 | (define lsh-service-type | 168 | (define lsh-service-type |
| 169 | (service-type (name 'lsh) | 169 | (service-type (name 'lsh) |
| 170 | (extensions | 170 | (extensions |
| 171 | (list (service-extension dmd-root-service-type | 171 | (list (service-extension shepherd-root-service-type |
| 172 | lsh-dmd-service) | 172 | lsh-shepherd-service) |
| 173 | (service-extension pam-root-service-type | 173 | (service-extension pam-root-service-type |
| 174 | lsh-pam-services) | 174 | lsh-pam-services) |
| 175 | (service-extension activation-service-type | 175 | (service-extension activation-service-type |
