From d7fd2679c82ad9c5453b30724914d9ba18532bd2 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 10 Apr 2016 10:37:34 +0100
Subject: [PATCH] Remove owncloud from interactive configuration

---
 src/freedombone-config | 67 ------------------------------------------
 1 file changed, 67 deletions(-)

diff --git a/src/freedombone-config b/src/freedombone-config
index cbf9c6e0..317908e2 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -89,8 +89,6 @@ WIKI_CODE=
 MY_BLOG_TITLE=
 FULLBLOG_DOMAIN_NAME=
 FULLBLOG_CODE=
-OWNCLOUD_DOMAIN_NAME=
-OWNCLOUD_CODE=
 MEDIAGOBLIN_ENABLED='no'
 MEDIAGOBLIN_DOMAIN_NAME=
 MEDIAGOBLIN_CODE=
@@ -262,12 +260,6 @@ function save_configuration_file {
     if [ $FULLBLOG_CODE ]; then
         echo "FULLBLOG_CODE=$FULLBLOG_CODE" >> $CONFIGURATION_FILE
     fi
-    if [ $OWNCLOUD_DOMAIN_NAME ]; then
-        echo "OWNCLOUD_DOMAIN_NAME=$OWNCLOUD_DOMAIN_NAME" >> $CONFIGURATION_FILE
-    fi
-    if [ $OWNCLOUD_CODE ]; then
-        echo "OWNCLOUD_CODE=$OWNCLOUD_CODE" >> $CONFIGURATION_FILE
-    fi
     if [ $HUBZILLA_DOMAIN_NAME ]; then
         echo "HUBZILLA_DOMAIN_NAME=$HUBZILLA_DOMAIN_NAME" >> $CONFIGURATION_FILE
     fi
@@ -1609,59 +1601,6 @@ function interactive_configuration {
         save_configuration_file
     fi
 
-    if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
-        if [[ $ONION_ONLY != "no" ]]; then
-            OWNCLOUD_DOMAIN_NAME='owncloud.local'
-        else
-            OWNCLOUD_DETAILS_COMPLETE=
-            while [ ! $OWNCLOUD_DETAILS_COMPLETE ]
-            do
-                data=$(tempfile 2>/dev/null)
-                trap "rm -f $data" 0 1 2 5 15
-                if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
-                    dialog --backtitle $"Freedombone Configuration" \
-                           --title $"Owncloud Configuration" \
-                           --form $"\nPlease enter your Owncloud details:" 11 55 3 \
-                           $"Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \
-                           $"Code:" 2 1 "$(grep 'OWNCLOUD_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 33 255 \
-                           2> $data
-                else
-                    dialog --backtitle $"Freedombone Configuration" \
-                           --title $"Owncloud Configuration" \
-                           --form $"\nPlease enter your Owncloud details:" 11 55 3 \
-                           $"Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \
-                           2> $data
-                fi
-                sel=$?
-                case $sel in
-                    1) exit 1;;
-                    255) exit 1;;
-                esac
-                OWNCLOUD_DOMAIN_NAME=$(cat $data | sed -n 1p)
-                if [ $OWNCLOUD_DOMAIN_NAME ]; then
-                    TEST_DOMAIN_NAME=$OWNCLOUD_DOMAIN_NAME
-                    validate_domain_name
-                    if [[ $TEST_DOMAIN_NAME != $OWNCLOUD_DOMAIN_NAME ]]; then
-                        OWNCLOUD_DOMAIN_NAME=
-                        dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
-                    else
-                        if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
-                            OWNCLOUD_CODE=$(cat $data | sed -n 2p)
-                            validate_freedns_code "$OWNCLOUD_CODE"
-                            if [ ! $VALID_CODE ]; then
-                                OWNCLOUD_DOMAIN_NAME=
-                            fi
-                        fi
-                    fi
-                fi
-                if [ $OWNCLOUD_DOMAIN_NAME ]; then
-                    OWNCLOUD_DETAILS_COMPLETE="yes"
-                fi
-            done
-        fi
-        save_configuration_file
-    fi
-
     if [[ $MEDIAGOBLIN_ENABLED == 'yes' ]]; then
         if [[ $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
             if [[ $ONION_ONLY != "no" ]]; then
@@ -2106,12 +2045,6 @@ function read_configuration {
         if grep -q "HUBZILLA_CODE" $CONFIGURATION_FILE; then
             HUBZILLA_CODE=$(grep "HUBZILLA_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
         fi
-        if grep -q "OWNCLOUD_DOMAIN_NAME" $CONFIGURATION_FILE; then
-            OWNCLOUD_DOMAIN_NAME=$(grep "OWNCLOUD_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-        fi
-        if grep -q "OWNCLOUD_CODE" $CONFIGURATION_FILE; then
-            OWNCLOUD_CODE=$(grep "OWNCLOUD_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-        fi
         if grep -q "MEDIAGOBLIN_DOMAIN_NAME" $CONFIGURATION_FILE; then
             MEDIAGOBLIN_DOMAIN_NAME=$(grep "MEDIAGOBLIN_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
         fi