--- a/debian/changelog Wed Mar 08 01:17:24 2017 +0100
+++ b/debian/changelog Wed Mar 08 21:32:23 2017 +0100
@@ -1,3 +1,9 @@
+schlittermann-ssh-keys (0.43) UNRELEASED; urgency=medium
+
+ * Depend on gpg|gpg2
+
+ -- Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> Wed, 08 Mar 2017 21:32:28 +0100
+
schlittermann-ssh-keys (0.42) stable oldstable oldoldstable; urgency=medium
* Use systemctl in update-schlittermann-ssh-keys
--- a/debian/control Wed Mar 08 01:17:24 2017 +0100
+++ b/debian/control Wed Mar 08 21:32:23 2017 +0100
@@ -7,7 +7,7 @@
Package: schlittermann-ssh-keys
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ssh (>> 4.3p2), perl (>> 5.8.8), libterm-readkey-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, ssh (>> 4.3p2), perl (>> 5.8.8), libterm-readkey-perl, gpg | gpg2
Description: Public ssh keys from Schlittermann technician
This package just contains the public ssh keys from the Schlittermann
technicians, and an script to manage an authorized_keys.local file.
--- a/debian/postinst Wed Mar 08 01:17:24 2017 +0100
+++ b/debian/postinst Wed Mar 08 21:32:23 2017 +0100
@@ -67,7 +67,8 @@
cat $out > /etc/ssh/sshd_config
if which systemctl >/dev/null; then
- systemctl try-reload-or-restart ssh.service
+ systemctl try-reload-or-restart ssh.service \
+ || systemctl reload-or-try-restart ssh.service
else
invoke-rc.d ssh reload || service ssh reload
fi
@@ -101,7 +102,8 @@
update_log_level
update_sshd_config
if which systemctl >/dev/null; then
- systemctl try-reload-or-restart ssh.service
+ systemctl try-reload-or-restart ssh.service \
+ || systemctl reload-or-try-restart ssh.service
else
invoke-rc.d ssh reload || service ssh reload
fi
--- a/update-schlittermann-ssh-keys.pl Wed Mar 08 01:17:24 2017 +0100
+++ b/update-schlittermann-ssh-keys.pl Wed Mar 08 21:32:23 2017 +0100
@@ -133,7 +133,7 @@
truncate($fh, tell($fh));
close($fh) or rename("$SSHD_CONF.bak" => $SSHD_CONF);
- system("systemctl try-reload-or-restart ssh.service || invoke-rc.d ssh reload");
+ system("systemctl try-reload-or-restart ssh.service || systemctl reload-or-try-restart ssh.service || invoke-rc.d ssh reload");
exit 0;
}