X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=all_new_2018%2Fsetup_server.sh;h=ea3437a444c899911e08800f2a613ffdcef627d6;hb=f2a01cfd1fb4fc2510ce1df00def189a10be42d7;hp=6eaf4e30613bf64f21676799cd08dbeee49d9421;hpb=c23144e7c48a68a277dc49203a278a7fe9936a36;p=config

diff --git a/all_new_2018/setup_server.sh b/all_new_2018/setup_server.sh
old mode 100644
new mode 100755
index 6eaf4e3..ea3437a
--- 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/.
@@ -18,5 +34,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