free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable mediagoblin, still won't install

This commit is contained in:
Bob Mottram 2016-04-01 22:32:58 +01:00
parent 87a6272287
commit 08d95603bc
2 changed files with 54 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone
View File

@ -10852,7 +10852,7 @@ install_hubzilla
#install_search_engine #install_search_engine
install_dlna_server install_dlna_server
configure_firewall_for_dlna configure_firewall_for_dlna
install_mediagoblin #install_mediagoblin
#install_ipfs #install_ipfs
repair_databases_script repair_databases_script
backup_to_friends_servers backup_to_friends_servers

102
src/freedombone-config
View File

@ -91,6 +91,7 @@ FULLBLOG_DOMAIN_NAME=
FULLBLOG_CODE= FULLBLOG_CODE=
OWNCLOUD_DOMAIN_NAME= OWNCLOUD_DOMAIN_NAME=
OWNCLOUD_CODE= OWNCLOUD_CODE=
MEDIAGOBLIN_ENABLED='no'
MEDIAGOBLIN_DOMAIN_NAME= MEDIAGOBLIN_DOMAIN_NAME=
MEDIAGOBLIN_CODE= MEDIAGOBLIN_CODE=
HUBZILLA_DOMAIN_NAME= HUBZILLA_DOMAIN_NAME=
@ -1661,63 +1662,66 @@ function interactive_configuration {
save_configuration_file save_configuration_file
fi fi
if [[ $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then if [[ $MEDIAGOBLIN_ENABLED == 'yes' ]]; then
if [[ $ONION_ONLY != "no" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
MEDIAGOBLIN_DOMAIN_NAME='media.local' if [[ $ONION_ONLY != "no" ]]; then
else MEDIAGOBLIN_DOMAIN_NAME='media.local'
MEDIAGOBLIN_DETAILS_COMPLETE= else
while [ ! $MEDIAGOBLIN_DETAILS_COMPLETE ] MEDIAGOBLIN_DETAILS_COMPLETE=
do while [ ! $MEDIAGOBLIN_DETAILS_COMPLETE ]
data=$(tempfile 2>/dev/null) do
trap "rm -f $data" 0 1 2 5 15 data=$(tempfile 2>/dev/null)
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then trap "rm -f $data" 0 1 2 5 15
dialog --backtitle $"Freedombone Configuration" \ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
--title $"Mediagoblin Configuration" \ dialog --backtitle $"Freedombone Configuration" \
--form $"\nPlease enter your Mediagoblin details, or just select Ok if you don't need a Mediagoblin site:" 11 55 2 \ --title $"Mediagoblin Configuration" \
$"Domain:" 1 1 "$(grep 'MEDIAGOBLIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \ --form $"\nPlease enter your Mediagoblin details, or just select Ok if you don't need a Mediagoblin site:" 11 55 2 \
$"Code:" 2 1 "$(grep 'MEDIAGOBLIN_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 33 255 \ $"Domain:" 1 1 "$(grep 'MEDIAGOBLIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \
2> $data $"Code:" 2 1 "$(grep 'MEDIAGOBLIN_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 33 255 \
else 2> $data
dialog --backtitle $"Freedombone Configuration" \
--title $"Mediagoblin Configuration" \
--form $"\nPlease enter your Mediagoblin details, or just select Ok if you don't need a Mediagoblin site:" 11 55 2 \
$"Domain:" 1 1 "$(grep 'MEDIAGOBLIN_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
MEDIAGOBLIN_DOMAIN_NAME=$(cat $data | sed -n 1p)
if [ $MEDIAGOBLIN_DOMAIN_NAME ]; then
TEST_DOMAIN_NAME=$MEDIAGOBLIN_DOMAIN_NAME
validate_domain_name
if [[ $TEST_DOMAIN_NAME != $MEDIAGOBLIN_DOMAIN_NAME ]]; then
MEDIAGOBLIN_DOMAIN_NAME='invalid'
dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
else else
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then dialog --backtitle $"Freedombone Configuration" \
MEDIAGOBLIN_CODE=$(cat $data | sed -n 2p) --title $"Mediagoblin Configuration" \
validate_freedns_code "$MEDIAGOBLIN_CODE" --form $"\nPlease enter your Mediagoblin details, or just select Ok if you don't need a Mediagoblin site:" 11 55 2 \
if [ ! $VALID_CODE ]; then $"Domain:" 1 1 "$(grep 'MEDIAGOBLIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \
MEDIAGOBLIN_DOMAIN_NAME='invalid' 2> $data
fi
sel=$?
case $sel in
1) exit 1;;
255) exit 1;;
esac
MEDIAGOBLIN_DOMAIN_NAME=$(cat $data | sed -n 1p)
if [ $MEDIAGOBLIN_DOMAIN_NAME ]; then
TEST_DOMAIN_NAME=$MEDIAGOBLIN_DOMAIN_NAME
validate_domain_name
if [[ $TEST_DOMAIN_NAME != $MEDIAGOBLIN_DOMAIN_NAME ]]; then
MEDIAGOBLIN_DOMAIN_NAME='invalid'
dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
else
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
MEDIAGOBLIN_CODE=$(cat $data | sed -n 2p)
validate_freedns_code "$MEDIAGOBLIN_CODE"
if [ ! $VALID_CODE ]; then
MEDIAGOBLIN_DOMAIN_NAME='invalid'
fi
fi fi
fi fi
fi fi
fi if [ $MEDIAGOBLIN_DOMAIN_NAME ]; then
if [ $MEDIAGOBLIN_DOMAIN_NAME ]; then if [[ $MEDIAGOBLIN_DOMAIN_NAME == 'invalid' ]]; then
if [[ $MEDIAGOBLIN_DOMAIN_NAME == 'invalid' ]]; then MEDIAGOBLIN_DOMAIN_NAME=
MEDIAGOBLIN_DOMAIN_NAME= else
else MEDIAGOBLIN_DETAILS_COMPLETE="yes"
MEDIAGOBLIN_DETAILS_COMPLETE="yes" fi
fi fi
fi done
done fi
save_configuration_file
fi fi
save_configuration_file
fi fi
if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
if [[ $ONION_ONLY != "no" ]]; then if [[ $ONION_ONLY != "no" ]]; then
HUBZILLA_DOMAIN_NAME='hubzilla.local' HUBZILLA_DOMAIN_NAME='hubzilla.local'