Various fixes.

diff --git a/bookworm/setup_scripts/copy_dirtree.sh b/bookworm/setup_scripts/copy_dirtree.sh
index 387ba392912c703fa42a864846acce6b99bd1f12..fbc3d9d622a5eba7792a852a5435177086f44e1b 100755 (executable)
--- a/bookworm/setup_scripts/copy_dirtree.sh
+++ b/bookworm/setup_scripts/copy_dirtree.sh
@@ -9,7 +9,7 @@
 # CAUTION: This removes original files at the affected paths.
 set -e
 . ./misc.sh
-. ./../misc.sh
+. ../../misc.sh
 
 expect_n_args 3 "(source root, target root, modules)" "$@"
 

diff --git a/bookworm/setup_scripts/migrate_borg.sh b/bookworm/setup_scripts/migrate_borg.sh
index 65ae67dd08dfdfd2002f65757d683e3a93084147..b08cf2d0cb23f258fb8c29558f32bdeef586d2c3 100755 (executable)
--- a/bookworm/setup_scripts/migrate_borg.sh
+++ b/bookworm/setup_scripts/migrate_borg.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 . ./misc.sh
-. ./../misc.sh
+. ../../misc.sh
 
 expect_n_args 1 "(old server IP)" "$@"
 old_server="$1"

diff --git a/bookworm/setup_scripts/mirror_dir.sh b/bookworm/setup_scripts/mirror_dir.sh
index aef69f189a6cdfcd9d8980aeac40affd7bb48590..d650165d90e5aa046ff892685d04e946965d971a 100755 (executable)
--- a/bookworm/setup_scripts/mirror_dir.sh
+++ b/bookworm/setup_scripts/mirror_dir.sh
@@ -2,7 +2,7 @@
 # Mirror directory tree from remote to local server, keeping the path.
 set -e
 . ./misc.sh
-. ./../misc.sh
+. ../../misc.sh
 
 expect_n_args 2 "(server, directory)" "$@"
 server=$1

diff --git a/bookworm/setup_scripts/prepare_to_meet_server.sh b/bookworm/setup_scripts/prepare_to_meet_server.sh
index 5f553623da2dffc165b2146306f2a43870ba76e6..8e54ca512013c258b10f0bd4b349b055b2e76372 100755 (executable)
--- a/bookworm/setup_scripts/prepare_to_meet_server.sh
+++ b/bookworm/setup_scripts/prepare_to_meet_server.sh
@@ -2,7 +2,7 @@
 # Do some of the steps necessary to SSH (key-based) with another server.
 set -e
 . ./misc.sh
-. ./../misc.sh
+. ../../misc.sh
 
 expect_n_args 1 "(server IP)" "$@"
 target="$1"

diff --git a/bookworm/setup_scripts/set_hostname_and_fqdn.sh b/bookworm/setup_scripts/set_hostname_and_fqdn.sh
index bcf3d9d96b1d5f1a2106eb1a1e13aec6cea02de4..929d8bcea2efa74ca25c5f1b24eae10b97eeaa21 100755 (executable)
--- a/bookworm/setup_scripts/set_hostname_and_fqdn.sh
+++ b/bookworm/setup_scripts/set_hostname_and_fqdn.sh
@@ -14,7 +14,7 @@
 # Ignores IPv6s.
 set -e
 . ./misc.sh
-. ./../misc.sh
+. ../../misc.sh
 
 expect_n_args 1 "(hostname, fqdn)" "$@"
 

diff --git a/bookworm/setup_scripts/setup_desktop.sh b/bookworm/setup_scripts/setup_desktop.sh
index 2eb19b32b890bce82c4b3f59b8599f6f534da24a..fe11b83063af225744fc8dad9b787bf91854c056 100755 (executable)
--- a/bookworm/setup_scripts/setup_desktop.sh
+++ b/bookworm/setup_scripts/setup_desktop.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 . ./misc.sh
-. ./../misc.sh
+. ../../misc.sh
 
 expect_n_args 1 "(system name)" "$@"
 get_system_name_arg "$1"

diff --git a/bookworm/setup_scripts/setup_home.sh b/bookworm/setup_scripts/setup_home.sh
index a065bd4fb90934b38dbd7f7e5bbbff03f07a23e6..54f0db15ca8ce5d098b7cd6d7600af3afb384c17 100755 (executable)
--- a/bookworm/setup_scripts/setup_home.sh
+++ b/bookworm/setup_scripts/setup_home.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 . ./misc.sh
-. ./../misc.sh
+. ../../misc.sh
 
 expect_n_args 1 "(system name)" "$@"
 get_system_name_arg "$1"

diff --git a/bookworm/setup_scripts/setup_server.sh b/bookworm/setup_scripts/setup_server.sh
index 93bfa1c467c701271eb6cd783f5571f5f4edf9f0..c854b959a4a3decc376a0d7cf82e6c5ef4396c31 100755 (executable)
--- a/bookworm/setup_scripts/setup_server.sh
+++ b/bookworm/setup_scripts/setup_server.sh
@@ -3,7 +3,7 @@
 # the outside via ./init_user_login.sh or ./init_user_and_keybased_login.sh
 set -e
 . ./misc.sh
-. ./../misc.sh
+. ../../misc.sh
 
 expect_n_args 2 "(hostname, FQDN)" "$@"
 hostname="$1"

diff --git a/bookworm/setup_scripts/setup_web.sh b/bookworm/setup_scripts/setup_web.sh
index d7c651f0fe6536640ee9c9f0875f48733c2b38d2..4807e8afd47f8fccefd76831297d476f2a127433 100755 (executable)
--- a/bookworm/setup_scripts/setup_web.sh
+++ b/bookworm/setup_scripts/setup_web.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 . ./misc.sh
-. ./../misc.sh
+. ../../misc.sh
 
 expect_setup_finished_file setup_server_has_been_run setup_server.sh
 

diff --git a/bookworm/setup_scripts/upgrade_from_bullseye.sh b/bookworm/setup_scripts/upgrade_from_bullseye.sh
index 6db4f2eeefefe3ab4bfc5b62e850a054ad309728..ed246e1e6a2ec0b2477078448df13c2f550842f1 100755 (executable)
--- a/bookworm/setup_scripts/upgrade_from_bullseye.sh
+++ b/bookworm/setup_scripts/upgrade_from_bullseye.sh
@@ -1,11 +1,15 @@
 #!/bin/sh
 
-# as per https://wiki.debian.org/DebianUpgrade
+# Upgrade a fresh (!) system to Bookworm, as per [1]. Fresh, because: Don't
+# expect any customized config files to survive this. If you run this on a
+# remote machine, take care not to loose anything you need to re-connect, e.g.
+# any relevant adaptations you did to /etc/ssh/sshd_config …
+
 set -e
 . ./misc.sh
 apt update
-apt -y -o Dpkg::Options::="--force-confnew" upgrade
-apt -y full-upgrade
+apt -y upgrade
+apt -y -o Dpkg::Options::="--force-confnew" full-upgrade
 path_sources_list="/etc/apt/sources.list"
 cp "${config_tree_prefix}/etc_files/all${path_sources_list}" "${path_sources_list}"
 apt clean

diff --git a/bullseye/etc_files/server/etc/ssh/sshd_config b/bullseye/etc_files/server/etc/ssh/sshd_config
index 8effa748160eb9e3843b31816f64c31a83eaccd6..811e93a20cdde097edc203f2c5214a813528917f 100644 (file)
--- a/bullseye/etc_files/server/etc/ssh/sshd_config
+++ b/bullseye/etc_files/server/etc/ssh/sshd_config
@@ -79,7 +79,7 @@ ChallengeResponseAuthentication no
 # be allowed through the ChallengeResponseAuthentication and
 # PasswordAuthentication.  Depending on your PAM configuration,
 # PAM authentication via ChallengeResponseAuthentication may bypass
-# the setting of "PermitRootLogin yes
+# the setting of "PermitRootLogin without-password".
 # If you just want the PAM account and session checks to run without
 # PAM authentication, then enable this but set PasswordAuthentication
 # and ChallengeResponseAuthentication to 'no'.
@@ -121,4 +121,4 @@ Subsystem   sftp    /usr/lib/openssh/sftp-server
 #      AllowTcpForwarding no
 #      PermitTTY no
 #      ForceCommand cvs server
-ClientAliveInterval 120
+ClientAliveInterval 15

diff --git a/bullseye/setup_scripts/init_user_and_keybased_login.sh b/bullseye/setup_scripts/init_user_and_keybased_login.sh
index 4fcc0625c26a3daea8d61f80d2f046fb781ce403..475b12f76363612cb54227cf4a41ece212ded322 100755 (executable)
--- a/bullseye/setup_scripts/init_user_and_keybased_login.sh
+++ b/bullseye/setup_scripts/init_user_and_keybased_login.sh
@@ -21,7 +21,8 @@ ssh-keygen -f "/home/plom/.ssh/known_hosts" -R "${server}"
 
 # This will be used to log-in as root from plom account.
 echo 'First, enter the old root password; then enter new password three times.'
-ssh root@"${server}" "passwd"
+#ssh root@"${server}" "passwd"
+ssh root@"${server}" "ls"
 
 # Save root password for sshpass
 stty -echo
@@ -40,7 +41,6 @@ export SSHPASS="${PW_ROOT}"
 # would require setting a password for user plom otherwise not needed.
 sshpass -e scp ~/.ssh/id_rsa.pub root@"${server}":/tmp/authorized_keys
 sshpass -e ssh root@"${server}" \
-        'useradd -m plom && '\
         'mkdir /home/plom/.ssh && '\
         'chown plom:plom /home/plom/.ssh && '\
         'chown plom:plom /tmp/authorized_keys && '\