Merge "Killing "sshd" does not trigger an alarm event"
This commit is contained in:
commit
bb9fe023cc
|
@ -1,3 +1,3 @@
|
|||
ssh_config /usr/share/starlingx
|
||||
sshd_config /usr/share/starlingx
|
||||
sshd.service /usr/share/starlingx
|
||||
ssh.service /usr/share/starlingx
|
||||
|
|
|
@ -4,6 +4,6 @@ set -e
|
|||
|
||||
cp -f /usr/share/starlingx/ssh_config /etc/ssh/ssh_config
|
||||
cp -f /usr/share/starlingx/sshd_config /etc/ssh/sshd_config
|
||||
cp -f /usr/share/starlingx/sshd.service /lib/systemd/system/sshd.service
|
||||
cp -f /usr/share/starlingx/ssh.service /lib/systemd/system/ssh.service
|
||||
|
||||
#DEBHELPER#
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
[Unit]
|
||||
Description=OpenBSD Secure Shell server
|
||||
After=network.target auditd.service
|
||||
ConditionPathExists=!/etc/ssh/sshd_not_to_be_run
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=-/etc/default/ssh
|
||||
ExecStartPre=/usr/sbin/sshd -t
|
||||
ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
|
||||
ExecReload=/usr/sbin/sshd -t
|
||||
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
|
|
@ -1,18 +0,0 @@
|
|||
[Unit]
|
||||
Description=OpenSSH server daemon
|
||||
Documentation=man:sshd(8) man:sshd_config(5)
|
||||
After=network.target sshd-keygen.service
|
||||
Wants=sshd-keygen.service
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=/etc/default/ssh
|
||||
ExecStart=/etc/init.d/sshd start
|
||||
ExecStop=/etc/init.d/sshd stop
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
PIDFile=/var/run/sshd.pid
|
||||
KillMode=none
|
||||
#Restart=on-failure
|
||||
#RestartSec=42s
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
Loading…
Reference in New Issue