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

Allow dns for onion only installs

This commit is contained in:
Bob Mottram 2015-12-30 22:59:09 +00:00
parent 9837ceac5f
commit ef1a0100ab
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/freedombone-config
View File

@ -208,8 +208,12 @@ function save_configuration_file {
echo "ENABLE_BABEL=$ENABLE_BABEL" >> $CONFIGURATION_FILE
fi
echo "DEBIAN_REPO=$DEBIAN_REPO" >> $CONFIGURATION_FILE
echo "NAMESERVER1=$NAMESERVER1" >> $CONFIGURATION_FILE
echo "NAMESERVER2=$NAMESERVER2" >> $CONFIGURATION_FILE
if [ $NAMESERVER1 ]; then
echo "NAMESERVER1=$NAMESERVER1" >> $CONFIGURATION_FILE
fi
if [ $NAMESERVER2 ]; then
echo "NAMESERVER2=$NAMESERVER2" >> $CONFIGURATION_FILE
fi
if [ $WIKI_TITLE ]; then
echo "WIKI_TITLE=$WIKI_TITLE" >> $CONFIGURATION_FILE
fi
@ -548,7 +552,13 @@ function interactive_configuration {
FREEDNS_MESSAGE=$"Please enter the FreeDNS code for this domain.\n\nThe code can be found by going to https://freedns.afraid.org, selecting 'Dynamic DNS' and then opening 'Wget example'. The code will consist of letters and numbers and be between the ? and = characters."
dialog --title $"Freedombone" --msgbox $"Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\n\nEnsure that you have your domain and dynamic DNS settings ready.\n\nFor more information please visit $FREEDOMBONE_WEBSITE or send a Bitmessage to $FREEDOMBONE_BITMESSAGE" 15 50
if [[ $ONION_ONLY == "no" ]]; then
INITIAL_MESSAGE=$"Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\n\nEnsure that you have your domain and dynamic DNS settings ready.\n\nFor more information please visit $FREEDOMBONE_WEBSITE or send a Bitmessage to $FREEDOMBONE_BITMESSAGE"
else
INITIAL_MESSAGE=$"Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\n\nWeb sites created will only be viewable within a Tor browser.\n\nFor more information please visit $FREEDOMBONE_WEBSITE or send a Bitmessage to $FREEDOMBONE_BITMESSAGE"
fi
dialog --title $"Freedombone" --msgbox "$INITIAL_MESSAGE" 15 50
data=$(tempfile 2>/dev/null)
trap "rm -f $data" 0 1 2 5 15
@ -987,7 +997,7 @@ function interactive_configuration {
DEBIAN_REPO='ftp.de.debian.org'
fi
if [[ $MINIMAL_INSTALL == "no" ]]; then
if [[ $MINIMAL_INSTALL == "no" && $ONION_ONLY == "no" ]]; then
data=$(tempfile 2>/dev/null)
trap "rm -f $data" 0 1 2 5 15
dialog --backtitle $"Freedombone Configuration" \
@ -1071,7 +1081,7 @@ function interactive_configuration {
NAMESERVER2='213.73.91.35'
fi
if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
if [[ $SYSTEM_TYPE != "$VARIANT_MESH" && $ONION_ONLY == "no" ]]; then
data=$(tempfile 2>/dev/null)
trap "rm -f $data" 0 1 2 5 15
@ -1196,7 +1206,7 @@ function interactive_configuration {
save_configuration_file
fi
if [[ $MINIMAL_INSTALL == "no" ]]; then
if [[ $MINIMAL_INSTALL == "no" && $ONION_ONLY == "no" ]]; then
SET_STATIC_IP="no"
dialog --title $"Static local IP address" \
--backtitle $"Freedombone Configuration" \