summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/README.Debian19
-rw-r--r--debian/changelog9
-rw-r--r--debian/openssh-server.examples1
-rwxr-xr-xdebian/openssh-server.install1
-rwxr-xr-xdebian/rules6
5 files changed, 29 insertions, 7 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
index d26e5a39d..f0e5bea24 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -232,6 +232,25 @@ it listen on a different address or port, then you will need to do this by
232copying /lib/systemd/system/ssh.socket to /etc/systemd/system/ssh.socket and 232copying /lib/systemd/system/ssh.socket to /etc/systemd/system/ssh.socket and
233modifying the ListenStream option. See systemd.socket(5) for details. 233modifying the ListenStream option. See systemd.socket(5) for details.
234 234
235Terminating SSH sessions cleanly on shutdown/reboot with systemd
236----------------------------------------------------------------
237
238If you have libpam-systemd >= 230 installed (following openssh-server's
239Recommends) and "UsePAM yes" in sshd_config (the default configuration
240shipped by this package), then SSH sessions will be terminated cleanly when
241the server is shut down or rebooted.
242
243If either of these conditions does not hold, then you may find that SSH
244sessions hang silently when the server is shut down or rebooted. If you do
245not want to use PAM or configure it properly for whatever reason, then you
246can instead copy
247/usr/share/doc/openssh-server/examples/ssh-session-cleanup.service to
248/etc/systemd/system/ and run "systemctl enable ssh-session-cleanup.service".
249
250Non-systemd users may find /usr/lib/openssh/ssh-session-cleanup helpful if
251they have a similar problem, although at present there is no system
252integration for this for anything other than systemd.
253
235-- 254--
236Matthew Vernon <matthew@debian.org> 255Matthew Vernon <matthew@debian.org>
237Colin Watson <cjwatson@debian.org> 256Colin Watson <cjwatson@debian.org>
diff --git a/debian/changelog b/debian/changelog
index e81c667cc..0977bc8c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
1openssh (1:7.2p2-8) UNRELEASED; urgency=medium
2
3 * Stop enabling ssh-session-cleanup.service by default; instead, ship it
4 as an example and add a section to README.Debian. libpam-systemd >= 230
5 and "UsePAM yes" should take care of the original problem for most
6 systemd users (thanks, Michael Biebl; closes: #832155).
7
8 -- Colin Watson <cjwatson@debian.org> Thu, 28 Jul 2016 22:04:37 +0100
9
1openssh (1:7.2p2-7) unstable; urgency=medium 10openssh (1:7.2p2-7) unstable; urgency=medium
2 11
3 * Don't stop the ssh-session-cleanup service on upgrade (closes: #832155). 12 * Don't stop the ssh-session-cleanup service on upgrade (closes: #832155).
diff --git a/debian/openssh-server.examples b/debian/openssh-server.examples
index 0d0e55a7a..ef6eb5468 100644
--- a/debian/openssh-server.examples
+++ b/debian/openssh-server.examples
@@ -1 +1,2 @@
1sshd_config 1sshd_config
2debian/systemd/ssh-session-cleanup.service
diff --git a/debian/openssh-server.install b/debian/openssh-server.install
index dabc440ab..f696de231 100755
--- a/debian/openssh-server.install
+++ b/debian/openssh-server.install
@@ -11,7 +11,6 @@ debian/systemd/ssh.socket lib/systemd/system
11debian/systemd/ssh@.service lib/systemd/system 11debian/systemd/ssh@.service lib/systemd/system
12debian/systemd/sshd.conf usr/lib/tmpfiles.d 12debian/systemd/sshd.conf usr/lib/tmpfiles.d
13debian/systemd/ssh-session-cleanup usr/lib/openssh 13debian/systemd/ssh-session-cleanup usr/lib/openssh
14debian/systemd/ssh-session-cleanup.service lib/systemd/system
15 14
16# dh_apport would be neater, but at the time of writing it isn't in unstable 15# dh_apport would be neater, but at the time of writing it isn't in unstable
17# yet. 16# yet.
diff --git a/debian/rules b/debian/rules
index 540418e7b..3a8c86cdc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -215,12 +215,6 @@ override_dh_installdocs:
215override_dh_systemd_enable: 215override_dh_systemd_enable:
216 dh_systemd_enable -popenssh-server --name ssh ssh.service 216 dh_systemd_enable -popenssh-server --name ssh ssh.service
217 dh_systemd_enable -popenssh-server --name ssh --no-enable ssh.socket 217 dh_systemd_enable -popenssh-server --name ssh --no-enable ssh.socket
218 dh_systemd_enable -popenssh-server --name ssh-session-cleanup \
219 ssh-session-cleanup.service
220
221override_dh_systemd_start:
222 dh_systemd_start -popenssh-server --no-restart-on-upgrade \
223 ssh-session-cleanup.service
224 218
225override_dh_installinit: 219override_dh_installinit:
226 dh_installinit -R --name ssh 220 dh_installinit -R --name ssh