merged
authorHeiko Schlittermann <hs@schlittermann.de>
Wed, 08 Mar 2017 00:43:27 +0100
changeset 96 0c4ed73d9bed
parent 95 2bfb0edc5001 (diff)
parent 92 f91099f1502c (current diff)
child 97 0370ded4ccb4
merged
debian/changelog
--- a/.hgtags	Fri Dec 30 09:05:04 2016 +0100
+++ b/.hgtags	Wed Mar 08 00:43:27 2017 +0100
@@ -29,3 +29,4 @@
 e12acf7c48bcfba201505ee5c69952c64a77ae8a schlittermann-ssh-keys_0.37
 71449e95f477456e79131645e846fa42e90cb64d schlittermann-ssh-keys_0.38
 382c8f5af40306a8cfeb79c9d90c38657475d2eb schlittermann-ssh-keys_0.39
+5eecf5adf1c1afdd9bc2500b4e33881a498ab641 schlittermann-ssh-keys_0.40
--- a/debian/changelog	Fri Dec 30 09:05:04 2016 +0100
+++ b/debian/changelog	Wed Mar 08 00:43:27 2017 +0100
@@ -1,3 +1,9 @@
+schlittermann-ssh-keys (0.40) stable oldstable oldoldstable; urgency=medium
+
+  * add systemctl
+
+ -- Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>  Wed, 08 Mar 2017 00:38:35 +0100
+
 schlittermann-ssh-keys (0.39+nmu1) stable oldstable oldoldstable; urgency=medium
 
   * Non-maintainer upload.
--- a/debian/postinst	Fri Dec 30 09:05:04 2016 +0100
+++ b/debian/postinst	Wed Mar 08 00:43:27 2017 +0100
@@ -66,7 +66,11 @@
     cp --backup=numbered -p /etc/ssh/sshd_config /etc/ssh/sshd_config~
     cat $out > /etc/ssh/sshd_config
 
-    invoke-rc.d ssh reload || service ssh reload
+    if which systemctl >/dev/null; then
+	systemctl try-reload-or-restart ssh.service
+    else
+	invoke-rc.d ssh reload || service ssh reload
+    fi
 }
 
 fix_local() {
@@ -96,7 +100,11 @@
 
 	update_log_level
 	update_sshd_config
-	invoke-rc.d ssh reload || service ssh reload
+	if which systemctl >/dev/null; then
+	    systemctl try-reload-or-restart ssh.service
+	else
+	    invoke-rc.d ssh reload || service ssh reload
+	fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)