committing changes in /etc after apt run

Package changes:
-apticron 1.1.61 all
+apticron 1.1.62 all
-libgudev-1.0-0 230-3 amd64
+libgudev-1.0-0 232-1 amd64
-libtommath1 1.0-4 amd64
+libtommath1 1.0.1-1 amd64
-openssh-client 1:7.5p1-5 amd64
-openssh-server 1:7.5p1-5 amd64
-openssh-sftp-server 1:7.5p1-5 amd64
+openssh-client 1:7.5p1-10 amd64
+openssh-server 1:7.5p1-10 amd64
+openssh-sftp-server 1:7.5p1-10 amd64

diff --git a/.etckeeper b/.etckeeper
index 4ce644abd4792dc2ddf807fa2e29566d449437a9..8df0230aa486ec16066263d735311797a011db91 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -351,7 +351,6 @@ maybe chmod 0755 'init.d/sudo'
 maybe chmod 0755 'init.d/udev'
 maybe chmod 0644 'init/salt-minion.conf'
 maybe chmod 0644 'init/salt-minion.override'
-maybe chmod 0644 'init/ssh.conf'
 maybe chmod 0755 'initramfs-tools'
 maybe chmod 0755 'initramfs-tools/conf.d'
 maybe chmod 0644 'initramfs-tools/conf.d/driver-policy'

diff --git a/init.d/ssh b/init.d/ssh
index 70a6c38f2e3a6ed2fb664c0ad9538e447c2ea756..f250008831e45d6c73f01b9d4f5085c2d1abb400 100755 (executable)
--- a/init.d/ssh
+++ b/init.d/ssh
@@ -33,12 +33,6 @@ run_by_init() {
     ([ "$previous" ] && [ "$runlevel" ]) || [ "$runlevel" = S ]
 }
 
-check_for_upstart() {
-    if init_is_upstart; then
-       exit $1
-    fi
-}
-
 check_for_no_start() {
     # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
     if [ -e /etc/ssh/sshd_not_to_be_run ]; then 
@@ -82,7 +76,6 @@ export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
 
 case "$1" in
   start)
-       check_for_upstart 1
        check_privsep_dir
        check_for_no_start
        check_dev_null
@@ -94,7 +87,6 @@ case "$1" in
        fi
        ;;
   stop)
-       check_for_upstart 0
        log_daemon_msg "Stopping OpenBSD Secure Shell server" "sshd" || true
        if start-stop-daemon --stop --quiet --oknodo --pidfile /run/sshd.pid; then
            log_end_msg 0 || true
@@ -104,7 +96,6 @@ case "$1" in
        ;;
 
   reload|force-reload)
-       check_for_upstart 1
        check_for_no_start
        check_config
        log_daemon_msg "Reloading OpenBSD Secure Shell server's configuration" "sshd" || true
@@ -116,7 +107,6 @@ case "$1" in
        ;;
 
   restart)
-       check_for_upstart 1
        check_privsep_dir
        check_config
        log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true
@@ -131,7 +121,6 @@ case "$1" in
        ;;
 
   try-restart)
-       check_for_upstart 1
        check_privsep_dir
        check_config
        log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true
@@ -162,7 +151,6 @@ case "$1" in
        ;;
 
   status)
-       check_for_upstart 1
        status_of_proc -p /run/sshd.pid /usr/sbin/sshd sshd && exit 0 || exit $?
        ;;
 

diff --git a/init/ssh.conf b/init/ssh.conf
deleted file mode 100644 (file)
index 9b0e954..0000000
--- a/init/ssh.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# ssh - OpenBSD Secure Shell server
-#
-# The OpenSSH server provides secure shell access to the system.
-
-description    "OpenSSH server"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-respawn
-respawn limit 10 5
-umask 022
-
-env SSH_SIGSTOP=1
-expect stop
-
-# 'sshd -D' leaks stderr and confuses things in conjunction with 'console log'
-console none
-
-pre-start script
-    test -x /usr/sbin/sshd || { stop; exit 0; }
-    test -e /etc/ssh/sshd_not_to_be_run && { stop; exit 0; }
-
-    mkdir -p -m0755 /run/sshd
-end script
-
-# if you used to set SSHD_OPTS in /etc/default/ssh, you can change the
-# 'exec' line here instead
-exec /usr/sbin/sshd -D