X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_server.sh;h=fa4cc6e84433afc0355e2d73a7c37e2cfcc9f5e5;hb=df8b56aab6c4b511bdca8f596300f72e02b95473;hp=0beee01d257eb41fad591cc628a62c0ef6b15b6e;hpb=6ed86b2a6d6370ebea7fec698716e02198edd1c1;p=config

diff --git a/buster/setup_scripts/setup_server.sh b/buster/setup_scripts/setup_server.sh
old mode 100644
new mode 100755
index 0beee01..fa4cc6e
--- a/buster/setup_scripts/setup_server.sh
+++ b/buster/setup_scripts/setup_server.sh
@@ -4,17 +4,23 @@
 set -e
 
 # Provide maximum input for set_hostname_and_fqdn.sh.
-if [ "$#" -ne 2 ]; then
+if [ "$#" -lt 2 ]; then
     echo 'Need exactly two arguments (hostname, FQDN).'
     false
 fi
 hostname="$1"
 fqdn="$2"
+additional_arg="$3"
 
 # Set up system without user environment.
-config_tree_prefix="${HOME}/public_repos/config/buster"
+config_tree_prefix="${HOME}/config/buster"
 setup_scripts_dir="${config_tree_prefix}/setup_scripts"
 cd "${setup_scripts_dir}"
-./setup.sh "${hostname}" "${fqdn}"
-./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" server
-./install_for_target.sh server
+./setup.sh "${hostname}" "${fqdn}" server "${additional_arg}"
+
+# If we have not yet set the shell for user plom, ensure it here. This
+# is mostly for convenience.
+usermod -s /bin/bash plom
+
+# Enable firewall.
+systemctl enable nftables.service