From d074b0c3b9e6a112fc072e12b48481aed4d657fe Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Thu, 31 Dec 2015 12:00:55 +0000
Subject: [PATCH] use avahi for the default domain name on onion only installs
---
src/freedombone | 2 +-
src/freedombone-image | 10 +++++++++-
src/freedombone-image-customise | 3 +++
src/freedombone-image-make | 2 ++
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/freedombone b/src/freedombone
index 17bea8b8f..a5ad2dce4 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -1239,7 +1239,7 @@ function set_default_onion_domains {
WIKI_DOMAIN_NAME='wiki.onion'
fi
if [ $DEFAULT_DOMAIN_NAME ]; then
- DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.onion"
+ DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local"
fi
}
diff --git a/src/freedombone-image b/src/freedombone-image
index f3742015c..5290dc787 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -84,6 +84,9 @@ MINIMAL_INSTALL="yes"
# default SSH port
SSH_PORT=2222
+# Whether sites are accessible only within a Tor browser
+ONION_ONLY="no"
+
mesh_router_setup_script() {
# create a setup script for a mesh router
mesh_script_filename=$1
@@ -188,6 +191,10 @@ case $key in
shift
VARIANT="$1"
;;
+ -o|--onion)
+ shift
+ ONION_ONLY="$1"
+ ;;
*)
# unknown option
;;
@@ -262,7 +269,8 @@ make $IMAGE_TYPE \
SSH_PUBKEY="$SSH_PUBKEY" \
GENERIC_IMAGE="$GENERIC_IMAGE" \
MINIMAL_INSTALL="$MINIMAL_INSTALL" \
- SSH_PORT="$SSH_PORT"
+ SSH_PORT="$SSH_PORT" \
+ ONION_ONLY="$ONION_ONLY"
if [ ! "$?" = "0" ]; then
echo $'Build failed'
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 4bd2be89c..098294998 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -65,6 +65,9 @@ GENERIC_IMAGE="no"
# default SSH port
SSH_PORT=2222
+# Whether sites are accessible only within a Tor browser
+ONION_ONLY="no"
+
enable_eatmydata_override() {
chroot $rootdir apt-get install --no-install-recommends -y eatmydata
if [ -x $rootdir/usr/bin/eatmydata ] && \
diff --git a/src/freedombone-image-make b/src/freedombone-image-make
index f07faa4d2..b41b9544f 100755
--- a/src/freedombone-image-make
+++ b/src/freedombone-image-make
@@ -53,6 +53,7 @@ export SSH_PUBKEY
export GENERIC_IMAGE
export MINIMAL_INSTALL
export SSH_PORT
+export ONION_ONLY
# Locate vmdebootstrap program fetched in Makefile
basedir=`pwd`
@@ -166,6 +167,7 @@ sudo sed -i "s|SSH_PUBKEY=.*|SSH_PUBKEY=${SSH_PUBKEY}|g" $TEMP_CUSTOMISE
sudo sed -i "s|GENERIC_IMAGE=.*|GENERIC_IMAGE=${GENERIC_IMAGE}|g" $TEMP_CUSTOMISE
sudo sed -i "s|MINIMAL_INSTALL=.*|MINIMAL_INSTALL=\"${MINIMAL_INSTALL}\"|g" $TEMP_CUSTOMISE
sudo sed -i "s|SSH_PORT=.*|SSH_PORT=\"${SSH_PORT}\"|g" $TEMP_CUSTOMISE
+sudo sed -i "s|ONION_ONLY=.*|ONION_ONLY=\"${ONION_ONLY}\"|g" $TEMP_CUSTOMISE
echo $"starting $VMDEBOOTSTRAP"
# Run vmdebootstrap script to create image
--
GitLab