From 62964309a7b333892f9bee92f0a828cc50bff8f9 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Fri, 4 Jan 2019 17:02:03 +0000
Subject: [PATCH] Allow new default domain to be set from webadmin
---
src/freedombone-installer | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/src/freedombone-installer b/src/freedombone-installer
index 5dc5f7466..48b7c00c6 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -75,6 +75,7 @@ MUTED_WORDS=/root/${PROJECT_NAME}-firewall-words.cfg
local_hostname=$(grep 'host-name' /etc/avahi/avahi-daemon.conf | awk -F '=' '{print $2}').local
webadmin_install_dir="/var/www/${local_hostname}/htdocs/admin"
+default_domain_file="$webadmin_install_dir/.default_domain.txt"
scuttlebot_file="$webadmin_install_dir/.scuttlebot_invite.txt"
email_proxy_file="$webadmin_install_dir/.emailproxy.txt"
theme_file="$webadmin_install_dir/.theme.txt"
@@ -2980,6 +2981,31 @@ function import_translations {
fi
}
+function change_default_domain {
+ if [ -f "$default_domain_file" ]; then
+ new_default_domain_name=$(cat "$default_domain_file")
+ rm "$default_domain_file"
+
+ if [ "$new_default_domain_name" ]; then
+ if [ ${#new_default_domain_name} -gt 5 ]; then
+ if [[ "$new_default_domain_name" == *'.'* ]]; then
+
+ # set the new default domain within the config file
+ if ! grep -q "NEW_DEFAULT_DOMAIN_NAME=" $CONFIGURATION_FILE; then
+ echo "NEW_DEFAULT_DOMAIN_NAME=$new_default_domain_name" >> $CONFIGURATION_FILE
+ else
+ sed -i "s|NEW_DEFAULT_DOMAIN_NAME=.*|NEW_DEFAULT_DOMAIN_NAME=$new_default_domain_name|g" $CONFIGURATION_FILE
+ fi
+
+ # initiate an upgrade
+ touch "$upgrade_file"
+
+ fi
+ fi
+ fi
+ fi
+}
+
function create_scuttlebot_invite {
if [ -f "$scuttlebot_file" ]; then
if [ -d /etc/scuttlebot ]; then
@@ -3479,6 +3505,7 @@ do
webadmin_upgrade
create_scuttlebot_invite
install_apps_from_webadmin
+ change_default_domain
sleep 1
remove_apps_from_webadmin
fi
--
GitLab