|
@@ -91,6 +91,7 @@ FULLBLOG_DOMAIN_NAME=
|
91
|
91
|
FULLBLOG_CODE=
|
92
|
92
|
OWNCLOUD_DOMAIN_NAME=
|
93
|
93
|
OWNCLOUD_CODE=
|
|
94
|
+MEDIAGOBLIN_ENABLED='no'
|
94
|
95
|
MEDIAGOBLIN_DOMAIN_NAME=
|
95
|
96
|
MEDIAGOBLIN_CODE=
|
96
|
97
|
HUBZILLA_DOMAIN_NAME=
|
|
@@ -1661,62 +1662,65 @@ function interactive_configuration {
|
1661
|
1662
|
save_configuration_file
|
1662
|
1663
|
fi
|
1663
|
1664
|
|
1664
|
|
- if [[ $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
|
1665
|
|
- if [[ $ONION_ONLY != "no" ]]; then
|
1666
|
|
- MEDIAGOBLIN_DOMAIN_NAME='media.local'
|
1667
|
|
- else
|
1668
|
|
- MEDIAGOBLIN_DETAILS_COMPLETE=
|
1669
|
|
- while [ ! $MEDIAGOBLIN_DETAILS_COMPLETE ]
|
1670
|
|
- do
|
1671
|
|
- data=$(tempfile 2>/dev/null)
|
1672
|
|
- trap "rm -f $data" 0 1 2 5 15
|
1673
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1674
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1675
|
|
- --title $"Mediagoblin Configuration" \
|
1676
|
|
- --form $"\nPlease enter your Mediagoblin details, or just select Ok if you don't need a Mediagoblin site:" 11 55 2 \
|
1677
|
|
- $"Domain:" 1 1 "$(grep 'MEDIAGOBLIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \
|
1678
|
|
- $"Code:" 2 1 "$(grep 'MEDIAGOBLIN_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 33 255 \
|
1679
|
|
- 2> $data
|
1680
|
|
- else
|
1681
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1682
|
|
- --title $"Mediagoblin Configuration" \
|
1683
|
|
- --form $"\nPlease enter your Mediagoblin details, or just select Ok if you don't need a Mediagoblin site:" 11 55 2 \
|
1684
|
|
- $"Domain:" 1 1 "$(grep 'MEDIAGOBLIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \
|
1685
|
|
- 2> $data
|
1686
|
|
- fi
|
1687
|
|
- sel=$?
|
1688
|
|
- case $sel in
|
1689
|
|
- 1) exit 1;;
|
1690
|
|
- 255) exit 1;;
|
1691
|
|
- esac
|
1692
|
|
- MEDIAGOBLIN_DOMAIN_NAME=$(cat $data | sed -n 1p)
|
1693
|
|
- if [ $MEDIAGOBLIN_DOMAIN_NAME ]; then
|
1694
|
|
- TEST_DOMAIN_NAME=$MEDIAGOBLIN_DOMAIN_NAME
|
1695
|
|
- validate_domain_name
|
1696
|
|
- if [[ $TEST_DOMAIN_NAME != $MEDIAGOBLIN_DOMAIN_NAME ]]; then
|
1697
|
|
- MEDIAGOBLIN_DOMAIN_NAME='invalid'
|
1698
|
|
- dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1665
|
+ if [[ $MEDIAGOBLIN_ENABLED == 'yes' ]]; then
|
|
1666
|
+ if [[ $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
|
|
1667
|
+ if [[ $ONION_ONLY != "no" ]]; then
|
|
1668
|
+ MEDIAGOBLIN_DOMAIN_NAME='media.local'
|
|
1669
|
+ else
|
|
1670
|
+ MEDIAGOBLIN_DETAILS_COMPLETE=
|
|
1671
|
+ while [ ! $MEDIAGOBLIN_DETAILS_COMPLETE ]
|
|
1672
|
+ do
|
|
1673
|
+ data=$(tempfile 2>/dev/null)
|
|
1674
|
+ trap "rm -f $data" 0 1 2 5 15
|
|
1675
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1676
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1677
|
+ --title $"Mediagoblin Configuration" \
|
|
1678
|
+ --form $"\nPlease enter your Mediagoblin details, or just select Ok if you don't need a Mediagoblin site:" 11 55 2 \
|
|
1679
|
+ $"Domain:" 1 1 "$(grep 'MEDIAGOBLIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \
|
|
1680
|
+ $"Code:" 2 1 "$(grep 'MEDIAGOBLIN_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 33 255 \
|
|
1681
|
+ 2> $data
|
1699
|
1682
|
else
|
1700
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1701
|
|
- MEDIAGOBLIN_CODE=$(cat $data | sed -n 2p)
|
1702
|
|
- validate_freedns_code "$MEDIAGOBLIN_CODE"
|
1703
|
|
- if [ ! $VALID_CODE ]; then
|
1704
|
|
- MEDIAGOBLIN_DOMAIN_NAME='invalid'
|
|
1683
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1684
|
+ --title $"Mediagoblin Configuration" \
|
|
1685
|
+ --form $"\nPlease enter your Mediagoblin details, or just select Ok if you don't need a Mediagoblin site:" 11 55 2 \
|
|
1686
|
+ $"Domain:" 1 1 "$(grep 'MEDIAGOBLIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \
|
|
1687
|
+ 2> $data
|
|
1688
|
+ fi
|
|
1689
|
+ sel=$?
|
|
1690
|
+ case $sel in
|
|
1691
|
+ 1) exit 1;;
|
|
1692
|
+ 255) exit 1;;
|
|
1693
|
+ esac
|
|
1694
|
+ MEDIAGOBLIN_DOMAIN_NAME=$(cat $data | sed -n 1p)
|
|
1695
|
+ if [ $MEDIAGOBLIN_DOMAIN_NAME ]; then
|
|
1696
|
+ TEST_DOMAIN_NAME=$MEDIAGOBLIN_DOMAIN_NAME
|
|
1697
|
+ validate_domain_name
|
|
1698
|
+ if [[ $TEST_DOMAIN_NAME != $MEDIAGOBLIN_DOMAIN_NAME ]]; then
|
|
1699
|
+ MEDIAGOBLIN_DOMAIN_NAME='invalid'
|
|
1700
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1701
|
+ else
|
|
1702
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1703
|
+ MEDIAGOBLIN_CODE=$(cat $data | sed -n 2p)
|
|
1704
|
+ validate_freedns_code "$MEDIAGOBLIN_CODE"
|
|
1705
|
+ if [ ! $VALID_CODE ]; then
|
|
1706
|
+ MEDIAGOBLIN_DOMAIN_NAME='invalid'
|
|
1707
|
+ fi
|
1705
|
1708
|
fi
|
1706
|
1709
|
fi
|
1707
|
1710
|
fi
|
1708
|
|
- fi
|
1709
|
|
- if [ $MEDIAGOBLIN_DOMAIN_NAME ]; then
|
1710
|
|
- if [[ $MEDIAGOBLIN_DOMAIN_NAME == 'invalid' ]]; then
|
1711
|
|
- MEDIAGOBLIN_DOMAIN_NAME=
|
1712
|
|
- else
|
1713
|
|
- MEDIAGOBLIN_DETAILS_COMPLETE="yes"
|
|
1711
|
+ if [ $MEDIAGOBLIN_DOMAIN_NAME ]; then
|
|
1712
|
+ if [[ $MEDIAGOBLIN_DOMAIN_NAME == 'invalid' ]]; then
|
|
1713
|
+ MEDIAGOBLIN_DOMAIN_NAME=
|
|
1714
|
+ else
|
|
1715
|
+ MEDIAGOBLIN_DETAILS_COMPLETE="yes"
|
|
1716
|
+ fi
|
1714
|
1717
|
fi
|
1715
|
|
- fi
|
1716
|
|
- done
|
|
1718
|
+ done
|
|
1719
|
+ fi
|
|
1720
|
+ save_configuration_file
|
1717
|
1721
|
fi
|
1718
|
|
- save_configuration_file
|
1719
|
1722
|
fi
|
|
1723
|
+
|
1720
|
1724
|
|
1721
|
1725
|
if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
|
1722
|
1726
|
if [[ $ONION_ONLY != "no" ]]; then
|