WIP.

[config] / all_new_2018 / setup_server.sh

diff --git a/all_new_2018/setup_server.sh b/all_new_2018/setup_server.sh
old mode 100644 (file)
new mode 100755 (executable)
index 6eaf4e3..55650aa
--- 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
@@ -18,5 +29,9 @@ apt update
 # we don't need to get more data than necessary.
 apt -y dist-upgrade
 
-# If we have not yet set the shell for user plom, ensure it here.
+# Set Berlin localtime.
+ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
+
+# If we have not yet set the shell for user plom, ensure it here. This
+# is mostly for convenience.
 usermod -s /bin/bash plom