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

Add mediagoblin to the interactive installer

This commit is contained in:
Bob Mottram 2016-03-31 10:19:10 +01:00
parent 4313994beb
commit 142486f03f
2 changed files with 315 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone
View File

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

65
src/freedombone-config
View File

@ -91,6 +91,8 @@ FULLBLOG_DOMAIN_NAME=
FULLBLOG_CODE=
OWNCLOUD_DOMAIN_NAME=
OWNCLOUD_CODE=
MEDIAGOBLIN_DOMAIN_NAME=
MEDIAGOBLIN_CODE=
HUBZILLA_DOMAIN_NAME=
HUBZILLA_CODE=
MICROBLOG_DOMAIN_NAME=
@ -1659,6 +1661,63 @@ function interactive_configuration {
save_configuration_file
fi
if [[ $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
if [[ $ONION_ONLY != "no" ]]; then
MEDIAGOBLIN_DOMAIN_NAME='media.local'
else
MEDIAGOBLIN_DETAILS_COMPLETE=
while [ ! $MEDIAGOBLIN_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 $"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 \
$"Code:" 2 1 "$(grep 'MEDIAGOBLIN_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 33 255 \
2> $data
else
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
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
if [ $MEDIAGOBLIN_DOMAIN_NAME ]; then
if [[ $MEDIAGOBLIN_DOMAIN_NAME == 'invalid' ]]; then
MEDIAGOBLIN_DOMAIN_NAME=
else
MEDIAGOBLIN_DETAILS_COMPLETE="yes"
fi
fi
done
fi
save_configuration_file
fi
if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
if [[ $ONION_ONLY != "no" ]]; then
HUBZILLA_DOMAIN_NAME='hubzilla.local'
@ -2049,6 +2108,12 @@ function read_configuration {
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
if grep -q "MEDIAGOBLIN_CODE" $CONFIGURATION_FILE; then
MEDIAGOBLIN_CODE=$(grep "MEDIAGOBLIN_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi
if grep -q "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE; then
WIKI_DOMAIN_NAME=$(grep "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi