Fix problems with web server setup.

[config] / all_new_2018 / setup_server.sh

diff --git a/all_new_2018/setup_server.sh b/all_new_2018/setup_server.sh
index 7778b9a314aaffcb17944448767000ac9fddd89b..ea3437a444c899911e08800f2a613ffdcef627d6 100755 (executable)
--- a/all_new_2018/setup_server.sh
+++ b/all_new_2018/setup_server.sh
@@ -3,10 +3,26 @@
 # the outside via ./init_user_and_keybased_login.sh.
 set -e
 
-# Adapt /etc/ to our needs by symlinking into ./linkable_etc_files. This
+# 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 hardlinking 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
+./hardlink_etc.sh all server
+
+# Set hostname and FQDN.
+./set_hostname_and_fqdn.sh "${hostname}" "${fqdn}"
+
+# Some debconf selections we don't want to get asked during coming
+# install actions.
+echo 'iptables-persistent iptables-persistent/autosave_v4 boolean false' | debconf-set-selections
+echo 'iptables-persistent iptables-persistent/autosave_v6 boolean false' | debconf-set-selections
 
 # Ensure package installation state as defined by what packages are
 # defined as required by Debian policy and by settings in ./apt-mark/.
@@ -19,7 +35,7 @@ apt update
 apt -y dist-upgrade
 
 # Set Berlin localtime.
-#ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/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.