projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ssh.service: fix ssh-keygen usage
[grml-live.git]
/
etc
/
grml
/
fai
/
config
/
files
/
etc
/
systemd
/
system
/
ssh.service
/
GRMLBASE
diff --git
a/etc/grml/fai/config/files/etc/systemd/system/ssh.service/GRMLBASE
b/etc/grml/fai/config/files/etc/systemd/system/ssh.service/GRMLBASE
index
0b5581d
..
3a6729e
100644
(file)
--- a/
etc/grml/fai/config/files/etc/systemd/system/ssh.service/GRMLBASE
+++ b/
etc/grml/fai/config/files/etc/systemd/system/ssh.service/GRMLBASE
@@
-1,6
+1,4
@@
-# This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/15-initsetup, using
-# ${GRML_FAI_CONFIG}/config/files/etc/systemd/system/ssh.service/GRMLBASE
+# This file was deployed via grml-live.
[Unit]
Description=OpenBSD Secure Shell server
[Unit]
Description=OpenBSD Secure Shell server
@@
-9,13
+7,17
@@
ConditionPathExists=!/etc/ssh/sshd_not_to_be_run
[Service]
EnvironmentFile=-/etc/default/ssh
[Service]
EnvironmentFile=-/etc/default/ssh
-ExecStartPre=-/
bin/sh -c "/usr/bin/ssh-keygen -A"
+ExecStartPre=-/
usr/bin/ssh-keygen -A
ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
+ExecReload=/usr/sbin/sshd -t
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
Restart=on-failure
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
Restart=on-failure
+RestartPreventExitStatus=255
+Type=notify
+RuntimeDirectory=sshd
+RuntimeDirectoryMode=0755
[Install]
WantedBy=multi-user.target
Alias=sshd.service
[Install]
WantedBy=multi-user.target
Alias=sshd.service
-