WIP.

diff --git a/all_new_2018/apt-mark/server b/all_new_2018/apt-mark/server
index 055ae7c38fa39145699979c70f201b86ae00119b..c51942bd5199e5ca65532e6bc3da82e55d8d7f07 100644 (file)
--- a/all_new_2018/apt-mark/server
+++ b/all_new_2018/apt-mark/server
@@ -2,3 +2,5 @@
 openssh-server
 # provides /etc/inputrc and understanding of ctrl+arrow key combos
 readline-common
+# provides letsencrypt
+certbot

diff --git a/all_new_2018/setup_server.sh b/all_new_2018/setup_server.sh
index 55635f79e8226b39025a5ac03168c30ee2efd3ba..55650aadecbb2e7496ed85778081f22404d68995 100755 (executable)
--- a/all_new_2018/setup_server.sh
+++ b/all_new_2018/setup_server.sh
@@ -3,11 +3,22 @@
 # the outside via ./init_user_and_keybased_login.sh.
 set -e
 
+# Provide maximum input for set_hostname_and_fqdn.sh.
+if "$#" -ne 2 ]; then
+    echo "Need exactly two arguments (hostname, FQDN)."
+    false
+fi
+hostname="$1"
+fqdn="$2"
+
 # Adapt /etc/ to our needs by symlinking into ./linkable_etc_files. This
 # will set basic configurations affecting following steps, such as setup
 # of APT and the locale selection, so needs to be right at the beginning.
 ./symlink_etc.sh all server
 
+# Set hostname and FQDN.
+./set_hostname_and_fqdn.sh "${hostname}" "${fqdn}"
+
 # Ensure package installation state as defined by what packages are
 # defined as required by Debian policy and by settings in ./apt-mark/.
 apt update