openssh: Fix systemd service files.

OpenSSH had problems with starting the daemon after installation.
This is now fixed.

diff --git a/openssh/openssh.nm b/openssh/openssh.nm
index d04d2b24d55df185e7b8210791cfcfdd8d6abd00..b2b90e4b7df4752960d3db4370186cf0a1049549 100644 (file)
--- a/openssh/openssh.nm
+++ b/openssh/openssh.nm
@@ -5,7 +5,7 @@
 
 name       = openssh
 version    = 5.9p1
-release    = 4
+release    = 5
 
 groups     = Application/Internet
 url        = http://www.openssh.com/portable.html
@@ -122,7 +122,7 @@ packages
                end
 
                script prein
-                       getent group sshd_keys >/dev/null || groupadd -r ssh_keys || :
+                       getent group ssh_keys >/dev/null || groupadd -r ssh_keys
                end
        end
 
@@ -203,9 +203,7 @@ packages
 
                script preun
                        /bin/systemctl --no-reload disable sshd.service >/dev/null 2>&1 || :
-                       /bin/systemctl --no-reload disable sshd-keygen.service >/dev/null 2>&1 || :
                        /bin/systemctl stop sshd.service >/dev/null 2>&1 || :
-                       /bin/systemctl stop sshd-keygen.service >/dev/null 2>&1 || :
                end
 
                script postun

diff --git a/openssh/systemd/sshd-keygen.service b/openssh/systemd/sshd-keygen.service
index bfef3289f4c287c0e87ef8e7fd7a20c83a5113a0..1554c242f962d57ea77acda07a18ec7ff0edb718 100644 (file)
--- a/openssh/systemd/sshd-keygen.service
+++ b/openssh/systemd/sshd-keygen.service
@@ -2,11 +2,9 @@
 Description=SSH server keys generation.
 After=syslog.target
 Before=sshd.service
+BindTo=sshd.service
 
 [Service]
 Type=oneshot
 ExecStart=/usr/sbin/sshd-keygen
 RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target

diff --git a/openssh/systemd/sshd.service b/openssh/systemd/sshd.service
index 6b90aa165c9686bb47f60664948e7e516e944978..9007d896704924b1f18647019782f6a759565bfd 100644 (file)
--- a/openssh/systemd/sshd.service
+++ b/openssh/systemd/sshd.service
@@ -3,7 +3,8 @@ Description=OpenSSH server daemon
 After=syslog.target network.target auditd.service
 
 [Service]
-ExecStart=/usr/sbin/sshd -D $OPTIONS
+ExecStartPre=/usr/sbin/sshd-keygen
+ExecStart=/usr/sbin/sshd -D
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]

diff --git a/openssh/systemd/sshd.socket b/openssh/systemd/sshd.socket
deleted file mode 100644 (file)
index 94b9533..0000000
--- a/openssh/systemd/sshd.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=OpenSSH Server Socket
-Conflicts=sshd.service
-
-[Socket]
-ListenStream=22
-Accept=yes
-
-[Install]
-WantedBy=sockets.target

diff --git a/openssh/systemd/sshd@.service b/openssh/systemd/sshd@.service
deleted file mode 100644 (file)
index 09f995e..0000000
--- a/openssh/systemd/sshd@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=OpenSSH per-connection server daemon
-After=syslog.target auditd.service
-
-[Service]
-EnvironmentFile=/etc/sysconfig/sshd
-ExecStart=-/usr/sbin/sshd -i $OPTIONS
-StandardInput=socket