Kaynağa Gözat

use avahi for the default domain name on onion only installs

Bob Mottram 9 yıl önce
ebeveyn
işleme
d074b0c3b9

+ 1
- 1
src/freedombone Dosyayı Görüntüle

1239
         WIKI_DOMAIN_NAME='wiki.onion'
1239
         WIKI_DOMAIN_NAME='wiki.onion'
1240
     fi
1240
     fi
1241
     if [ $DEFAULT_DOMAIN_NAME ]; then
1241
     if [ $DEFAULT_DOMAIN_NAME ]; then
1242
-        DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.onion"
1242
+        DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local"
1243
     fi
1243
     fi
1244
 }
1244
 }
1245
 
1245
 

+ 9
- 1
src/freedombone-image Dosyayı Görüntüle

84
 # default SSH port
84
 # default SSH port
85
 SSH_PORT=2222
85
 SSH_PORT=2222
86
 
86
 
87
+# Whether sites are accessible only within a Tor browser
88
+ONION_ONLY="no"
89
+
87
 mesh_router_setup_script() {
90
 mesh_router_setup_script() {
88
     # create a setup script for a mesh router
91
     # create a setup script for a mesh router
89
     mesh_script_filename=$1
92
     mesh_script_filename=$1
188
     shift
191
     shift
189
     VARIANT="$1"
192
     VARIANT="$1"
190
     ;;
193
     ;;
194
+    -o|--onion)
195
+    shift
196
+    ONION_ONLY="$1"
197
+    ;;
191
     *)
198
     *)
192
     # unknown option
199
     # unknown option
193
     ;;
200
     ;;
262
     SSH_PUBKEY="$SSH_PUBKEY" \
269
     SSH_PUBKEY="$SSH_PUBKEY" \
263
     GENERIC_IMAGE="$GENERIC_IMAGE" \
270
     GENERIC_IMAGE="$GENERIC_IMAGE" \
264
     MINIMAL_INSTALL="$MINIMAL_INSTALL" \
271
     MINIMAL_INSTALL="$MINIMAL_INSTALL" \
265
-    SSH_PORT="$SSH_PORT"
272
+    SSH_PORT="$SSH_PORT" \
273
+    ONION_ONLY="$ONION_ONLY"
266
 
274
 
267
 if [ ! "$?" = "0" ]; then
275
 if [ ! "$?" = "0" ]; then
268
     echo $'Build failed'
276
     echo $'Build failed'

+ 3
- 0
src/freedombone-image-customise Dosyayı Görüntüle

65
 # default SSH port
65
 # default SSH port
66
 SSH_PORT=2222
66
 SSH_PORT=2222
67
 
67
 
68
+# Whether sites are accessible only within a Tor browser
69
+ONION_ONLY="no"
70
+
68
 enable_eatmydata_override() {
71
 enable_eatmydata_override() {
69
     chroot $rootdir apt-get install --no-install-recommends -y eatmydata
72
     chroot $rootdir apt-get install --no-install-recommends -y eatmydata
70
     if [ -x $rootdir/usr/bin/eatmydata ] && \
73
     if [ -x $rootdir/usr/bin/eatmydata ] && \

+ 2
- 0
src/freedombone-image-make Dosyayı Görüntüle

53
 export GENERIC_IMAGE
53
 export GENERIC_IMAGE
54
 export MINIMAL_INSTALL
54
 export MINIMAL_INSTALL
55
 export SSH_PORT
55
 export SSH_PORT
56
+export ONION_ONLY
56
 
57
 
57
 # Locate vmdebootstrap program fetched in Makefile
58
 # Locate vmdebootstrap program fetched in Makefile
58
 basedir=`pwd`
59
 basedir=`pwd`
166
 sudo sed -i "s|GENERIC_IMAGE=.*|GENERIC_IMAGE=${GENERIC_IMAGE}|g" $TEMP_CUSTOMISE
167
 sudo sed -i "s|GENERIC_IMAGE=.*|GENERIC_IMAGE=${GENERIC_IMAGE}|g" $TEMP_CUSTOMISE
167
 sudo sed -i "s|MINIMAL_INSTALL=.*|MINIMAL_INSTALL=\"${MINIMAL_INSTALL}\"|g" $TEMP_CUSTOMISE
168
 sudo sed -i "s|MINIMAL_INSTALL=.*|MINIMAL_INSTALL=\"${MINIMAL_INSTALL}\"|g" $TEMP_CUSTOMISE
168
 sudo sed -i "s|SSH_PORT=.*|SSH_PORT=\"${SSH_PORT}\"|g" $TEMP_CUSTOMISE
169
 sudo sed -i "s|SSH_PORT=.*|SSH_PORT=\"${SSH_PORT}\"|g" $TEMP_CUSTOMISE
170
+sudo sed -i "s|ONION_ONLY=.*|ONION_ONLY=\"${ONION_ONLY}\"|g" $TEMP_CUSTOMISE
169
 
171
 
170
 echo $"starting $VMDEBOOTSTRAP"
172
 echo $"starting $VMDEBOOTSTRAP"
171
 # Run vmdebootstrap script to create image
173
 # Run vmdebootstrap script to create image