|
@@ -89,8 +89,6 @@ WIKI_CODE=
|
89
|
89
|
MY_BLOG_TITLE=
|
90
|
90
|
FULLBLOG_DOMAIN_NAME=
|
91
|
91
|
FULLBLOG_CODE=
|
92
|
|
-OWNCLOUD_DOMAIN_NAME=
|
93
|
|
-OWNCLOUD_CODE=
|
94
|
92
|
MEDIAGOBLIN_ENABLED='no'
|
95
|
93
|
MEDIAGOBLIN_DOMAIN_NAME=
|
96
|
94
|
MEDIAGOBLIN_CODE=
|
|
@@ -262,12 +260,6 @@ function save_configuration_file {
|
262
|
260
|
if [ $FULLBLOG_CODE ]; then
|
263
|
261
|
echo "FULLBLOG_CODE=$FULLBLOG_CODE" >> $CONFIGURATION_FILE
|
264
|
262
|
fi
|
265
|
|
- if [ $OWNCLOUD_DOMAIN_NAME ]; then
|
266
|
|
- echo "OWNCLOUD_DOMAIN_NAME=$OWNCLOUD_DOMAIN_NAME" >> $CONFIGURATION_FILE
|
267
|
|
- fi
|
268
|
|
- if [ $OWNCLOUD_CODE ]; then
|
269
|
|
- echo "OWNCLOUD_CODE=$OWNCLOUD_CODE" >> $CONFIGURATION_FILE
|
270
|
|
- fi
|
271
|
263
|
if [ $HUBZILLA_DOMAIN_NAME ]; then
|
272
|
264
|
echo "HUBZILLA_DOMAIN_NAME=$HUBZILLA_DOMAIN_NAME" >> $CONFIGURATION_FILE
|
273
|
265
|
fi
|
|
@@ -1609,59 +1601,6 @@ function interactive_configuration {
|
1609
|
1601
|
save_configuration_file
|
1610
|
1602
|
fi
|
1611
|
1603
|
|
1612
|
|
- if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
|
1613
|
|
- if [[ $ONION_ONLY != "no" ]]; then
|
1614
|
|
- OWNCLOUD_DOMAIN_NAME='owncloud.local'
|
1615
|
|
- else
|
1616
|
|
- OWNCLOUD_DETAILS_COMPLETE=
|
1617
|
|
- while [ ! $OWNCLOUD_DETAILS_COMPLETE ]
|
1618
|
|
- do
|
1619
|
|
- data=$(tempfile 2>/dev/null)
|
1620
|
|
- trap "rm -f $data" 0 1 2 5 15
|
1621
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1622
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1623
|
|
- --title $"Owncloud Configuration" \
|
1624
|
|
- --form $"\nPlease enter your Owncloud details:" 11 55 3 \
|
1625
|
|
- $"Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \
|
1626
|
|
- $"Code:" 2 1 "$(grep 'OWNCLOUD_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 33 255 \
|
1627
|
|
- 2> $data
|
1628
|
|
- else
|
1629
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1630
|
|
- --title $"Owncloud Configuration" \
|
1631
|
|
- --form $"\nPlease enter your Owncloud details:" 11 55 3 \
|
1632
|
|
- $"Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \
|
1633
|
|
- 2> $data
|
1634
|
|
- fi
|
1635
|
|
- sel=$?
|
1636
|
|
- case $sel in
|
1637
|
|
- 1) exit 1;;
|
1638
|
|
- 255) exit 1;;
|
1639
|
|
- esac
|
1640
|
|
- OWNCLOUD_DOMAIN_NAME=$(cat $data | sed -n 1p)
|
1641
|
|
- if [ $OWNCLOUD_DOMAIN_NAME ]; then
|
1642
|
|
- TEST_DOMAIN_NAME=$OWNCLOUD_DOMAIN_NAME
|
1643
|
|
- validate_domain_name
|
1644
|
|
- if [[ $TEST_DOMAIN_NAME != $OWNCLOUD_DOMAIN_NAME ]]; then
|
1645
|
|
- OWNCLOUD_DOMAIN_NAME=
|
1646
|
|
- dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
1647
|
|
- else
|
1648
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1649
|
|
- OWNCLOUD_CODE=$(cat $data | sed -n 2p)
|
1650
|
|
- validate_freedns_code "$OWNCLOUD_CODE"
|
1651
|
|
- if [ ! $VALID_CODE ]; then
|
1652
|
|
- OWNCLOUD_DOMAIN_NAME=
|
1653
|
|
- fi
|
1654
|
|
- fi
|
1655
|
|
- fi
|
1656
|
|
- fi
|
1657
|
|
- if [ $OWNCLOUD_DOMAIN_NAME ]; then
|
1658
|
|
- OWNCLOUD_DETAILS_COMPLETE="yes"
|
1659
|
|
- fi
|
1660
|
|
- done
|
1661
|
|
- fi
|
1662
|
|
- save_configuration_file
|
1663
|
|
- fi
|
1664
|
|
-
|
1665
|
1604
|
if [[ $MEDIAGOBLIN_ENABLED == 'yes' ]]; then
|
1666
|
1605
|
if [[ $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
|
1667
|
1606
|
if [[ $ONION_ONLY != "no" ]]; then
|
|
@@ -2106,12 +2045,6 @@ function read_configuration {
|
2106
|
2045
|
if grep -q "HUBZILLA_CODE" $CONFIGURATION_FILE; then
|
2107
|
2046
|
HUBZILLA_CODE=$(grep "HUBZILLA_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
2108
|
2047
|
fi
|
2109
|
|
- if grep -q "OWNCLOUD_DOMAIN_NAME" $CONFIGURATION_FILE; then
|
2110
|
|
- OWNCLOUD_DOMAIN_NAME=$(grep "OWNCLOUD_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
2111
|
|
- fi
|
2112
|
|
- if grep -q "OWNCLOUD_CODE" $CONFIGURATION_FILE; then
|
2113
|
|
- OWNCLOUD_CODE=$(grep "OWNCLOUD_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
2114
|
|
- fi
|
2115
|
2048
|
if grep -q "MEDIAGOBLIN_DOMAIN_NAME" $CONFIGURATION_FILE; then
|
2116
|
2049
|
MEDIAGOBLIN_DOMAIN_NAME=$(grep "MEDIAGOBLIN_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
2117
|
2050
|
fi
|