Improve websites server setup.

diff --git a/bookworm/setup_scripts/init_user_login.sh b/bookworm/setup_scripts/init_user_login.sh
index aa8a03f6b090c076f6bbec57fda41bfeec004174..820b5abf60ca191d02ed8f1457e7043a26dd1681 100755 (executable)
--- a/bookworm/setup_scripts/init_user_login.sh
+++ b/bookworm/setup_scripts/init_user_login.sh
@@ -18,6 +18,9 @@ local_path_sshd_config="${linkable_files_dir}${system_path_sshd_config}"
 expect_n_args 1 "(server)" "$@"
 server="$1"
 
 expect_n_args 1 "(server)" "$@"
 server="$1"
 

+# If we already knew that host …
+ssh-keygen -f "/home/plom/.ssh/known_hosts" -R "${server}"
+

 # So we're only asked once …
 eval $(ssh-agent)
 ssh-add
 # So we're only asked once …
 eval $(ssh-agent)
 ssh-add

diff --git a/bookworm/setup_scripts/setup_status.plomlompom.com.sh b/bookworm/setup_scripts/setup_status.plomlompom.com.sh
index a637b099f1f2f445818370ddf0c41f05c668db1a..e5db2111ea337fab27f1aff10e15b37f6484c781 100755 (executable)
--- a/bookworm/setup_scripts/setup_status.plomlompom.com.sh
+++ b/bookworm/setup_scripts/setup_status.plomlompom.com.sh
@@ -6,9 +6,17 @@ expect_setup_finished_file setup_web_has_been_run setup_web.sh
 
 if [ -z "$1" ]; then
     domain="status.plomlompom.com"
 
 if [ -z "$1" ]; then
     domain="status.plomlompom.com"

+    mail="plom+status@plomlompom.com"
+elif [ "$#" -lt 2 ]; then
+    domain="$1"
+    mail="plom+testing@plomlompom.com"

 else
     domain="$1"
 else
     domain="$1"

+    mail="$2"

 fi
 fi

+echo "Assuming domain ${domain} and letsencrypt support mail address ${mail}, abort and provide as arguments in this order if other desired! (Otherwise just hit Return.)"
+read
+

 # Install configs, set up firewall.
 ./install_for_target.sh status.plomlompom.com
 ./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" status.plomlompom.com 
 # Install configs, set up firewall.
 ./install_for_target.sh status.plomlompom.com
 ./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" status.plomlompom.com 

diff --git a/bookworm/setup_scripts/setup_tube.plomlompom.com.sh b/bookworm/setup_scripts/setup_tube.plomlompom.com.sh
index cf124fe32f52e0a1ae51cec7568edc778224888b..8833de0212e7b67729a5e73d0b3879d21a9f9ec3 100755 (executable)
--- a/bookworm/setup_scripts/setup_tube.plomlompom.com.sh
+++ b/bookworm/setup_scripts/setup_tube.plomlompom.com.sh
@@ -6,9 +6,17 @@ expect_setup_finished_file setup_web_has_been_run setup_web.sh
 
 if [ -z "$1" ]; then
     domain="tube.plomlompom.com"
 
 if [ -z "$1" ]; then
     domain="tube.plomlompom.com"

+    mail="plom+tube@plomlompom.com"
+elif [ "$#" -lt 2 ]; then
+    domain="$1"
+    mail="plom+testing@plomlompom.com"

 else
     domain="$1"
 else
     domain="$1"

+    mail="$2"

 fi
 fi

+echo "Assuming domain ${domain} and letsencrypt support mail address ${mail}, abort and provide as arguments in this order if other desired! (Otherwise just hit Return.)"
+read
+

 # Install configs, set up firewall.
 ./install_for_target.sh tube.plomlompom.com
 ./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" tube.plomlompom.com
 # Install configs, set up firewall.
 ./install_for_target.sh tube.plomlompom.com
 ./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" tube.plomlompom.com