From e4de79aa9d735af32105c8da3060c418f9499077 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 29 Jan 2015 14:39:15 +0000 Subject: [PATCH] Domain checking for non-interactive installs --- src/freedombone | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/freedombone b/src/freedombone index 3849aa91..b97fd216 100755 --- a/src/freedombone +++ b/src/freedombone @@ -1225,6 +1225,27 @@ function read_configuration { fi } +# check an individual domain name +function test_domain_name { + if [ $1 ]; then + TEST_DOMAIN_NAME=$1 + validate_domain_name + if [[ $TEST_DOMAIN_NAME != $1 ]]; then + echo $TEST_DOMAIN_NAME + exit 8528 + fi + fi +} + +# check that domain names are sensible +function check_domains { + test_domain_name $WIKI_DOMAIN_NAME + test_domain_name $OWNCLOUD_DOMAIN_NAME + test_domain_name $FULLBLOG_DOMAIN_NAME + test_domain_name $MICROBLOG_DOMAIN_NAME + test_domain_name $REDMATRIX_DOMAIN_NAME +} + # Checks whether certificates were generated for the given hostname function check_certificates { if [ ! $1 ]; then @@ -8697,6 +8718,7 @@ function install_final { read_configuration parse_args +check_domains install_not_on_BBB remove_default_user configure_firewall