Message ID | edfb218139346f926361bfe0be51e148cd7488ee.1575403175.git.leo@famulari.name |
---|---|
State | Accepted |
Headers | show |
Series | [bug#38477] services: SSH services: Provide 'ssh' and 'sshd' Shepherd services. | expand |
Leo Famulari <leo@famulari.name> writes: > This should improve the "user experience" when querying the status of > the SSH service. We could even add program specific strings like > "lshd", "dropbear", and "openssh". Thoughts? I think this is a good idea. It would add a lot of granular control. However, we would need to make sure this is a standard used for other SSH options in the future. > * gnu/services/ssh.scm (lsh-shepherd-service, dropbear-shepherd-service, > openssh-sheperd-service): Add 'ssh' and 'sshd' to provision. > --- > gnu/services/ssh.scm | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm > index ced1991fba..7e25810eff 100644 > --- a/gnu/services/ssh.scm > +++ b/gnu/services/ssh.scm > @@ -174,7 +174,7 @@ > > (list (shepherd-service > (documentation "GNU lsh SSH server") > - (provision '(ssh-daemon)) > + (provision '(ssh-daemon ssh sshd)) > (requirement requires) > (start #~(make-forkexec-constructor (list #$@lsh-command))) > (stop #~(make-kill-destructor))))) > @@ -511,7 +511,7 @@ of user-name/file-like tuples." > (list (shepherd-service > (documentation "OpenSSH server.") > (requirement '(syslogd loopback)) > - (provision '(ssh-daemon)) > + (provision '(ssh-daemon ssh sshd)) > (start #~(make-forkexec-constructor #$openssh-command > #:pid-file #$pid-file)) > (stop #~(make-kill-destructor)) > @@ -620,7 +620,7 @@ of user-name/file-like tuples." > (list (shepherd-service > (documentation "Dropbear SSH server.") > (requirement requires) > - (provision '(ssh-daemon)) > + (provision '(ssh-daemon ssh sshd)) > (start #~(make-forkexec-constructor #$dropbear-command > #:pid-file #$pid-file)) > (stop #~(make-kill-destructor))))) LGTM! Very simple solution. Should be easy to cross-implement to other uses.
On Tue, Dec 03, 2019 at 09:06:28PM -0600, Brett Gilio wrote: > Leo Famulari <leo@famulari.name> writes: > > > This should improve the "user experience" when querying the status of > > the SSH service. We could even add program specific strings like > > "lshd", "dropbear", and "openssh". Thoughts? > > I think this is a good idea. It would add a lot of granular > control. However, we would need to make sure this is a standard used for > other SSH options in the future. Okay, all are welcome to make this change :) > LGTM! Very simple solution. Should be easy to cross-implement to other uses. Thanks! Pushed as 1a7633c2397714c492482282da670e47f7dc8177
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index ced1991fba..7e25810eff 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -174,7 +174,7 @@ (list (shepherd-service (documentation "GNU lsh SSH server") - (provision '(ssh-daemon)) + (provision '(ssh-daemon ssh sshd)) (requirement requires) (start #~(make-forkexec-constructor (list #$@lsh-command))) (stop #~(make-kill-destructor))))) @@ -511,7 +511,7 @@ of user-name/file-like tuples." (list (shepherd-service (documentation "OpenSSH server.") (requirement '(syslogd loopback)) - (provision '(ssh-daemon)) + (provision '(ssh-daemon ssh sshd)) (start #~(make-forkexec-constructor #$openssh-command #:pid-file #$pid-file)) (stop #~(make-kill-destructor)) @@ -620,7 +620,7 @@ of user-name/file-like tuples." (list (shepherd-service (documentation "Dropbear SSH server.") (requirement requires) - (provision '(ssh-daemon)) + (provision '(ssh-daemon ssh sshd)) (start #~(make-forkexec-constructor #$dropbear-command #:pid-file #$pid-file)) (stop #~(make-kill-destructor)))))