|
@@ -123,6 +123,7 @@ function show_help {
|
123
|
123
|
echo $' -m --min Minimum password length (characters)'
|
124
|
124
|
echo $' -w --www Freedombone web site'
|
125
|
125
|
echo $' -b --bm Freedombone support Bitmessage address'
|
|
126
|
+ echo $' -o --onion [yes|no] Whether to only create .onion sites'
|
126
|
127
|
echo $' --minimal [yes|no] For minimalistic "consumer grade" installs'
|
127
|
128
|
echo ''
|
128
|
129
|
exit 0
|
|
@@ -161,6 +162,10 @@ do
|
161
|
162
|
shift
|
162
|
163
|
MINIMAL_INSTALL="$1"
|
163
|
164
|
;;
|
|
165
|
+ -o|--onion)
|
|
166
|
+ shift
|
|
167
|
+ ONION_ONLY="$1"
|
|
168
|
+ ;;
|
164
|
169
|
*)
|
165
|
170
|
# unknown option
|
166
|
171
|
;;
|
|
@@ -1236,386 +1241,420 @@ function interactive_configuration {
|
1236
|
1241
|
fi
|
1237
|
1242
|
|
1238
|
1243
|
if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
|
1239
|
|
- WIKI_DETAILS_COMPLETE=
|
1240
|
|
- while [ ! $WIKI_DETAILS_COMPLETE ]
|
1241
|
|
- do
|
1242
|
|
- data=$(tempfile 2>/dev/null)
|
1243
|
|
- trap "rm -f $data" 0 1 2 5 15
|
|
1244
|
+ if [[ $ONION_ONLY != "no" ]]; then
|
|
1245
|
+ WIKI_TITLE='My Wiki'
|
|
1246
|
+ WIKI_DOMAIN_NAME='wiki.onion'
|
|
1247
|
+ else
|
|
1248
|
+ WIKI_DETAILS_COMPLETE=
|
|
1249
|
+ while [ ! $WIKI_DETAILS_COMPLETE ]
|
|
1250
|
+ do
|
|
1251
|
+ data=$(tempfile 2>/dev/null)
|
|
1252
|
+ trap "rm -f $data" 0 1 2 5 15
|
1244
|
1253
|
|
1245
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1246
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1247
|
|
- --title $"Wiki Configuration" \
|
1248
|
|
- --form $"\nPlease enter your wiki details:" 11 55 4 \
|
1249
|
|
- $"Title:" 1 1 "$(grep 'WIKI_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
1250
|
|
- $"Domain:" 2 1 "$(grep 'WIKI_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
|
1251
|
|
- $"Code:" 3 1 "$(grep 'WIKI_CODE' temp.cfg | awk -F '=' '{print $2}')" 3 16 25 40 \
|
1252
|
|
- 2> $data
|
1253
|
|
- else
|
1254
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1255
|
|
- --title $"Wiki Configuration" \
|
1256
|
|
- --form $"\nPlease enter your wiki details:" 11 55 3 \
|
1257
|
|
- $"Title:" 1 1 "$(grep 'WIKI_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
1258
|
|
- $"Domain:" 2 1 "$(grep 'WIKI_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
|
1259
|
|
- 2> $data
|
1260
|
|
- fi
|
1261
|
|
- sel=$?
|
1262
|
|
- case $sel in
|
1263
|
|
- 1) exit 1;;
|
1264
|
|
- 255) exit 1;;
|
1265
|
|
- esac
|
1266
|
|
- WIKI_TITLE=$(cat $data | sed -n 1p)
|
1267
|
|
- WIKI_DOMAIN_NAME=$(cat $data | sed -n 2p)
|
1268
|
|
- if [ $WIKI_DOMAIN_NAME ]; then
|
1269
|
|
- TEST_DOMAIN_NAME=$WIKI_DOMAIN_NAME
|
1270
|
|
- validate_domain_name
|
1271
|
|
- if [[ $TEST_DOMAIN_NAME != $WIKI_DOMAIN_NAME ]]; then
|
1272
|
|
- WIKI_DOMAIN_NAME=
|
1273
|
|
- dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1254
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1255
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1256
|
+ --title $"Wiki Configuration" \
|
|
1257
|
+ --form $"\nPlease enter your wiki details:" 11 55 4 \
|
|
1258
|
+ $"Title:" 1 1 "$(grep 'WIKI_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
|
1259
|
+ $"Domain:" 2 1 "$(grep 'WIKI_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
|
|
1260
|
+ $"Code:" 3 1 "$(grep 'WIKI_CODE' temp.cfg | awk -F '=' '{print $2}')" 3 16 25 40 \
|
|
1261
|
+ 2> $data
|
1274
|
1262
|
else
|
1275
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1276
|
|
- WIKI_CODE=$(cat $data | sed -n 3p)
|
1277
|
|
- if [ ${#WIKI_CODE} -lt 30 ]; then
|
1278
|
|
- WIKI_DOMAIN_NAME=
|
1279
|
|
- dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1263
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1264
|
+ --title $"Wiki Configuration" \
|
|
1265
|
+ --form $"\nPlease enter your wiki details:" 11 55 3 \
|
|
1266
|
+ $"Title:" 1 1 "$(grep 'WIKI_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
|
1267
|
+ $"Domain:" 2 1 "$(grep 'WIKI_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
|
|
1268
|
+ 2> $data
|
|
1269
|
+ fi
|
|
1270
|
+ sel=$?
|
|
1271
|
+ case $sel in
|
|
1272
|
+ 1) exit 1;;
|
|
1273
|
+ 255) exit 1;;
|
|
1274
|
+ esac
|
|
1275
|
+ WIKI_TITLE=$(cat $data | sed -n 1p)
|
|
1276
|
+ WIKI_DOMAIN_NAME=$(cat $data | sed -n 2p)
|
|
1277
|
+ if [ $WIKI_DOMAIN_NAME ]; then
|
|
1278
|
+ TEST_DOMAIN_NAME=$WIKI_DOMAIN_NAME
|
|
1279
|
+ validate_domain_name
|
|
1280
|
+ if [[ $TEST_DOMAIN_NAME != $WIKI_DOMAIN_NAME ]]; then
|
|
1281
|
+ WIKI_DOMAIN_NAME=
|
|
1282
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1283
|
+ else
|
|
1284
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1285
|
+ WIKI_CODE=$(cat $data | sed -n 3p)
|
|
1286
|
+ if [ ${#WIKI_CODE} -lt 30 ]; then
|
|
1287
|
+ WIKI_DOMAIN_NAME=
|
|
1288
|
+ dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1289
|
+ fi
|
1280
|
1290
|
fi
|
1281
|
1291
|
fi
|
1282
|
1292
|
fi
|
1283
|
|
- fi
|
1284
|
|
- if [ $WIKI_DOMAIN_NAME ]; then
|
1285
|
|
- WIKI_DETAILS_COMPLETE="yes"
|
1286
|
|
- fi
|
1287
|
|
- done
|
|
1293
|
+ if [ $WIKI_DOMAIN_NAME ]; then
|
|
1294
|
+ WIKI_DETAILS_COMPLETE="yes"
|
|
1295
|
+ fi
|
|
1296
|
+ done
|
|
1297
|
+ fi
|
1288
|
1298
|
save_configuration_file
|
1289
|
1299
|
fi
|
1290
|
1300
|
|
1291
|
1301
|
if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
|
1292
|
|
- FULLBLOG_DETAILS_COMPLETE=
|
1293
|
|
- while [ ! $FULLBLOG_DETAILS_COMPLETE ]
|
1294
|
|
- do
|
1295
|
|
- data=$(tempfile 2>/dev/null)
|
1296
|
|
- trap "rm -f $data" 0 1 2 5 15
|
1297
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1298
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1299
|
|
- --title $"Blog Configuration" \
|
1300
|
|
- --form $"\nPlease enter your blog details:" 11 55 4 \
|
1301
|
|
- $"Title:" 1 1 "$(grep 'MY_BLOG_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1302
|
|
- $"Domain:" 2 1 "$(grep 'FULLBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
1303
|
|
- $"Code:" 3 1 "$(grep 'FULLBLOG_CODE' temp.cfg | awk -F '=' '{print $2}')" 3 16 25 30 \
|
1304
|
|
- 2> $data
|
1305
|
|
- else
|
1306
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1307
|
|
- --title $"Blog Configuration" \
|
1308
|
|
- --form $"\nPlease enter your blog details:" 11 55 3 \
|
1309
|
|
- $"Title:" 1 1 "$(grep 'MY_BLOG_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1310
|
|
- $"Domain:" 2 1 "$(grep 'FULLBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
1311
|
|
- 2> $data
|
1312
|
|
- fi
|
1313
|
|
- sel=$?
|
1314
|
|
- case $sel in
|
1315
|
|
- 1) exit 1;;
|
1316
|
|
- 255) exit 1;;
|
1317
|
|
- esac
|
1318
|
|
- MY_BLOG_TITLE=$(cat $data | sed -n 1p)
|
1319
|
|
- FULLBLOG_DOMAIN_NAME=$(cat $data | sed -n 2p)
|
1320
|
|
- if [ $FULLBLOG_DOMAIN_NAME ]; then
|
1321
|
|
- if [[ $FULLBLOG_DOMAIN_NAME == "$WIKI_DOMAIN_NAME" ]]; then
|
1322
|
|
- FULLBLOG_DOMAIN_NAME=""
|
1323
|
|
- fi
|
1324
|
|
- TEST_DOMAIN_NAME=$FULLBLOG_DOMAIN_NAME
|
1325
|
|
- validate_domain_name
|
1326
|
|
- if [[ $TEST_DOMAIN_NAME != $FULLBLOG_DOMAIN_NAME ]]; then
|
1327
|
|
- FULLBLOG_DOMAIN_NAME=
|
1328
|
|
- dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1302
|
+ if [[ $ONION_ONLY != "no" ]]; then
|
|
1303
|
+ MY_BLOG_TITLE='My Blog'
|
|
1304
|
+ FULLBLOG_DOMAIN_NAME='blog.onion'
|
|
1305
|
+ else
|
|
1306
|
+ FULLBLOG_DETAILS_COMPLETE=
|
|
1307
|
+ while [ ! $FULLBLOG_DETAILS_COMPLETE ]
|
|
1308
|
+ do
|
|
1309
|
+ data=$(tempfile 2>/dev/null)
|
|
1310
|
+ trap "rm -f $data" 0 1 2 5 15
|
|
1311
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1312
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1313
|
+ --title $"Blog Configuration" \
|
|
1314
|
+ --form $"\nPlease enter your blog details:" 11 55 4 \
|
|
1315
|
+ $"Title:" 1 1 "$(grep 'MY_BLOG_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1316
|
+ $"Domain:" 2 1 "$(grep 'FULLBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
|
1317
|
+ $"Code:" 3 1 "$(grep 'FULLBLOG_CODE' temp.cfg | awk -F '=' '{print $2}')" 3 16 25 30 \
|
|
1318
|
+ 2> $data
|
1329
|
1319
|
else
|
1330
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1331
|
|
- FULLBLOG_CODE=$(cat $data | sed -n 3p)
|
1332
|
|
- if [ ${#FULLBLOG_CODE} -lt 30 ]; then
|
1333
|
|
- FULLBLOG_DOMAIN_NAME=
|
1334
|
|
- dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1320
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1321
|
+ --title $"Blog Configuration" \
|
|
1322
|
+ --form $"\nPlease enter your blog details:" 11 55 3 \
|
|
1323
|
+ $"Title:" 1 1 "$(grep 'MY_BLOG_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1324
|
+ $"Domain:" 2 1 "$(grep 'FULLBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
|
1325
|
+ 2> $data
|
|
1326
|
+ fi
|
|
1327
|
+ sel=$?
|
|
1328
|
+ case $sel in
|
|
1329
|
+ 1) exit 1;;
|
|
1330
|
+ 255) exit 1;;
|
|
1331
|
+ esac
|
|
1332
|
+ MY_BLOG_TITLE=$(cat $data | sed -n 1p)
|
|
1333
|
+ FULLBLOG_DOMAIN_NAME=$(cat $data | sed -n 2p)
|
|
1334
|
+ if [ $FULLBLOG_DOMAIN_NAME ]; then
|
|
1335
|
+ if [[ $FULLBLOG_DOMAIN_NAME == "$WIKI_DOMAIN_NAME" ]]; then
|
|
1336
|
+ FULLBLOG_DOMAIN_NAME=""
|
|
1337
|
+ fi
|
|
1338
|
+ TEST_DOMAIN_NAME=$FULLBLOG_DOMAIN_NAME
|
|
1339
|
+ validate_domain_name
|
|
1340
|
+ if [[ $TEST_DOMAIN_NAME != $FULLBLOG_DOMAIN_NAME ]]; then
|
|
1341
|
+ FULLBLOG_DOMAIN_NAME=
|
|
1342
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1343
|
+ else
|
|
1344
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1345
|
+ FULLBLOG_CODE=$(cat $data | sed -n 3p)
|
|
1346
|
+ if [ ${#FULLBLOG_CODE} -lt 30 ]; then
|
|
1347
|
+ FULLBLOG_DOMAIN_NAME=
|
|
1348
|
+ dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1349
|
+ fi
|
1335
|
1350
|
fi
|
1336
|
1351
|
fi
|
1337
|
1352
|
fi
|
1338
|
|
- fi
|
1339
|
|
- if [ $FULLBLOG_DOMAIN_NAME ]; then
|
1340
|
|
- FULLBLOG_DETAILS_COMPLETE="yes"
|
1341
|
|
- fi
|
1342
|
|
- done
|
|
1353
|
+ if [ $FULLBLOG_DOMAIN_NAME ]; then
|
|
1354
|
+ FULLBLOG_DETAILS_COMPLETE="yes"
|
|
1355
|
+ fi
|
|
1356
|
+ done
|
|
1357
|
+ fi
|
1343
|
1358
|
save_configuration_file
|
1344
|
1359
|
fi
|
1345
|
1360
|
|
1346
|
1361
|
if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
|
1347
|
|
- OWNCLOUD_DETAILS_COMPLETE=
|
1348
|
|
- while [ ! $OWNCLOUD_DETAILS_COMPLETE ]
|
1349
|
|
- do
|
1350
|
|
- data=$(tempfile 2>/dev/null)
|
1351
|
|
- trap "rm -f $data" 0 1 2 5 15
|
1352
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1353
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1354
|
|
- --title $"Owncloud Configuration" \
|
1355
|
|
- --form $"\nPlease enter your Owncloud details:" 11 55 3 \
|
1356
|
|
- $"Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1357
|
|
- $"Code:" 2 1 "$(grep 'OWNCLOUD_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
1358
|
|
- 2> $data
|
1359
|
|
- else
|
1360
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1361
|
|
- --title $"Owncloud Configuration" \
|
1362
|
|
- --form $"\nPlease enter your Owncloud details:" 11 55 3 \
|
1363
|
|
- $"Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1364
|
|
- 2> $data
|
1365
|
|
- fi
|
1366
|
|
- sel=$?
|
1367
|
|
- case $sel in
|
1368
|
|
- 1) exit 1;;
|
1369
|
|
- 255) exit 1;;
|
1370
|
|
- esac
|
1371
|
|
- OWNCLOUD_DOMAIN_NAME=$(cat $data | sed -n 1p)
|
1372
|
|
- if [ $OWNCLOUD_DOMAIN_NAME ]; then
|
1373
|
|
- TEST_DOMAIN_NAME=$OWNCLOUD_DOMAIN_NAME
|
1374
|
|
- validate_domain_name
|
1375
|
|
- if [[ $TEST_DOMAIN_NAME != $OWNCLOUD_DOMAIN_NAME ]]; then
|
1376
|
|
- OWNCLOUD_DOMAIN_NAME=
|
1377
|
|
- dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1362
|
+ if [[ $ONION_ONLY != "no" ]]; then
|
|
1363
|
+ OWNCLOUD_DOMAIN_NAME='owncloud.onion'
|
|
1364
|
+ else
|
|
1365
|
+ OWNCLOUD_DETAILS_COMPLETE=
|
|
1366
|
+ while [ ! $OWNCLOUD_DETAILS_COMPLETE ]
|
|
1367
|
+ do
|
|
1368
|
+ data=$(tempfile 2>/dev/null)
|
|
1369
|
+ trap "rm -f $data" 0 1 2 5 15
|
|
1370
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1371
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1372
|
+ --title $"Owncloud Configuration" \
|
|
1373
|
+ --form $"\nPlease enter your Owncloud details:" 11 55 3 \
|
|
1374
|
+ $"Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1375
|
+ $"Code:" 2 1 "$(grep 'OWNCLOUD_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
|
1376
|
+ 2> $data
|
1378
|
1377
|
else
|
1379
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1380
|
|
- OWNCLOUD_CODE=$(cat $data | sed -n 2p)
|
1381
|
|
- if [ ${#OWNCLOUD_CODE} -lt 30 ]; then
|
1382
|
|
- OWNCLOUD_DOMAIN_NAME=
|
1383
|
|
- dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1378
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1379
|
+ --title $"Owncloud Configuration" \
|
|
1380
|
+ --form $"\nPlease enter your Owncloud details:" 11 55 3 \
|
|
1381
|
+ $"Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1382
|
+ 2> $data
|
|
1383
|
+ fi
|
|
1384
|
+ sel=$?
|
|
1385
|
+ case $sel in
|
|
1386
|
+ 1) exit 1;;
|
|
1387
|
+ 255) exit 1;;
|
|
1388
|
+ esac
|
|
1389
|
+ OWNCLOUD_DOMAIN_NAME=$(cat $data | sed -n 1p)
|
|
1390
|
+ if [ $OWNCLOUD_DOMAIN_NAME ]; then
|
|
1391
|
+ TEST_DOMAIN_NAME=$OWNCLOUD_DOMAIN_NAME
|
|
1392
|
+ validate_domain_name
|
|
1393
|
+ if [[ $TEST_DOMAIN_NAME != $OWNCLOUD_DOMAIN_NAME ]]; then
|
|
1394
|
+ OWNCLOUD_DOMAIN_NAME=
|
|
1395
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1396
|
+ else
|
|
1397
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1398
|
+ OWNCLOUD_CODE=$(cat $data | sed -n 2p)
|
|
1399
|
+ if [ ${#OWNCLOUD_CODE} -lt 30 ]; then
|
|
1400
|
+ OWNCLOUD_DOMAIN_NAME=
|
|
1401
|
+ dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1402
|
+ fi
|
1384
|
1403
|
fi
|
1385
|
1404
|
fi
|
1386
|
1405
|
fi
|
1387
|
|
- fi
|
1388
|
|
- if [ $OWNCLOUD_DOMAIN_NAME ]; then
|
1389
|
|
- OWNCLOUD_DETAILS_COMPLETE="yes"
|
1390
|
|
- fi
|
1391
|
|
- done
|
|
1406
|
+ if [ $OWNCLOUD_DOMAIN_NAME ]; then
|
|
1407
|
+ OWNCLOUD_DETAILS_COMPLETE="yes"
|
|
1408
|
+ fi
|
|
1409
|
+ done
|
|
1410
|
+ fi
|
1392
|
1411
|
save_configuration_file
|
1393
|
1412
|
fi
|
1394
|
1413
|
|
1395
|
1414
|
if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
|
1396
|
|
- HUBZILLA_DETAILS_COMPLETE=
|
1397
|
|
- while [ ! $HUBZILLA_DETAILS_COMPLETE ]
|
1398
|
|
- do
|
1399
|
|
- data=$(tempfile 2>/dev/null)
|
1400
|
|
- trap "rm -f $data" 0 1 2 5 15
|
1401
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1402
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1403
|
|
- --title $"Hubzilla Configuration" \
|
1404
|
|
- --form $"\nPlease enter your Hubzilla details.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 14 55 3 \
|
1405
|
|
- $"Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1406
|
|
- $"Code:" 2 1 "$(grep 'HUBZILLA_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
1407
|
|
- 2> $data
|
1408
|
|
- else
|
1409
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1410
|
|
- --title $"Hubzilla Configuration" \
|
1411
|
|
- --form $"\nPlease enter your Hubzilla details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 11 55 3 \
|
1412
|
|
- $"Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1413
|
|
- 2> $data
|
1414
|
|
- fi
|
1415
|
|
- sel=$?
|
1416
|
|
- case $sel in
|
1417
|
|
- 1) exit 1;;
|
1418
|
|
- 255) exit 1;;
|
1419
|
|
- esac
|
1420
|
|
- HUBZILLA_DOMAIN_NAME=$(cat $data | sed -n 1p)
|
1421
|
|
- if [ $HUBZILLA_DOMAIN_NAME ]; then
|
1422
|
|
- TEST_DOMAIN_NAME=$HUBZILLA_DOMAIN_NAME
|
1423
|
|
- validate_domain_name
|
1424
|
|
- if [[ $TEST_DOMAIN_NAME != $HUBZILLA_DOMAIN_NAME ]]; then
|
1425
|
|
- HUBZILLA_DOMAIN_NAME=
|
1426
|
|
- dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1415
|
+ if [[ $ONION_ONLY != "no" ]]; then
|
|
1416
|
+ HUBZILLA_DOMAIN_NAME='hubzilla.onion'
|
|
1417
|
+ else
|
|
1418
|
+ HUBZILLA_DETAILS_COMPLETE=
|
|
1419
|
+ while [ ! $HUBZILLA_DETAILS_COMPLETE ]
|
|
1420
|
+ do
|
|
1421
|
+ data=$(tempfile 2>/dev/null)
|
|
1422
|
+ trap "rm -f $data" 0 1 2 5 15
|
|
1423
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1424
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1425
|
+ --title $"Hubzilla Configuration" \
|
|
1426
|
+ --form $"\nPlease enter your Hubzilla details.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 14 55 3 \
|
|
1427
|
+ $"Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1428
|
+ $"Code:" 2 1 "$(grep 'HUBZILLA_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
|
1429
|
+ 2> $data
|
1427
|
1430
|
else
|
1428
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1429
|
|
- HUBZILLA_CODE=$(cat $data | sed -n 2p)
|
1430
|
|
- if [ ${#HUBZILLA_CODE} -lt 30 ]; then
|
1431
|
|
- HUBZILLA_DOMAIN_NAME=
|
1432
|
|
- dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1431
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1432
|
+ --title $"Hubzilla Configuration" \
|
|
1433
|
+ --form $"\nPlease enter your Hubzilla details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 11 55 3 \
|
|
1434
|
+ $"Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1435
|
+ 2> $data
|
|
1436
|
+ fi
|
|
1437
|
+ sel=$?
|
|
1438
|
+ case $sel in
|
|
1439
|
+ 1) exit 1;;
|
|
1440
|
+ 255) exit 1;;
|
|
1441
|
+ esac
|
|
1442
|
+ HUBZILLA_DOMAIN_NAME=$(cat $data | sed -n 1p)
|
|
1443
|
+ if [ $HUBZILLA_DOMAIN_NAME ]; then
|
|
1444
|
+ TEST_DOMAIN_NAME=$HUBZILLA_DOMAIN_NAME
|
|
1445
|
+ validate_domain_name
|
|
1446
|
+ if [[ $TEST_DOMAIN_NAME != $HUBZILLA_DOMAIN_NAME ]]; then
|
|
1447
|
+ HUBZILLA_DOMAIN_NAME=
|
|
1448
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1449
|
+ else
|
|
1450
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1451
|
+ HUBZILLA_CODE=$(cat $data | sed -n 2p)
|
|
1452
|
+ if [ ${#HUBZILLA_CODE} -lt 30 ]; then
|
|
1453
|
+ HUBZILLA_DOMAIN_NAME=
|
|
1454
|
+ dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1455
|
+ fi
|
1433
|
1456
|
fi
|
1434
|
1457
|
fi
|
1435
|
1458
|
fi
|
1436
|
|
- fi
|
1437
|
|
- if [ $HUBZILLA_DOMAIN_NAME ]; then
|
1438
|
|
- HUBZILLA_DETAILS_COMPLETE="yes"
|
1439
|
|
- fi
|
1440
|
|
- done
|
|
1459
|
+ if [ $HUBZILLA_DOMAIN_NAME ]; then
|
|
1460
|
+ HUBZILLA_DETAILS_COMPLETE="yes"
|
|
1461
|
+ fi
|
|
1462
|
+ done
|
|
1463
|
+ fi
|
1441
|
1464
|
save_configuration_file
|
1442
|
1465
|
fi
|
1443
|
1466
|
|
1444
|
1467
|
if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
|
1445
|
|
- MICROBLOG_DETAILS_COMPLETE=
|
1446
|
|
- while [ ! $MICROBLOG_DETAILS_COMPLETE ]
|
1447
|
|
- do
|
1448
|
|
- data=$(tempfile 2>/dev/null)
|
1449
|
|
- trap "rm -f $data" 0 1 2 5 15
|
1450
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1451
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1452
|
|
- --title $"Microblog Configuration" \
|
1453
|
|
- --form $"\nPlease enter your Microblog details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 11 55 3 \
|
1454
|
|
- $"Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1455
|
|
- $"Code:" 2 1 "$(grep 'MICROBLOG_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
1456
|
|
- 2> $data
|
1457
|
|
- else
|
1458
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1459
|
|
- --title $"Microblog Configuration" \
|
1460
|
|
- --form $"\nPlease enter your Microblog details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 11 55 3 \
|
1461
|
|
- $"Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1462
|
|
- 2> $data
|
1463
|
|
- fi
|
1464
|
|
- sel=$?
|
1465
|
|
- case $sel in
|
1466
|
|
- 1) exit 1;;
|
1467
|
|
- 255) exit 1;;
|
1468
|
|
- esac
|
1469
|
|
- MICROBLOG_DOMAIN_NAME=$(cat $data | sed -n 1p)
|
1470
|
|
- if [ $MICROBLOG_DOMAIN_NAME ]; then
|
1471
|
|
- if [[ $MICROBLOG_DOMAIN_NAME == "$HUBZILLA_DOMAIN_NAME" ]]; then
|
1472
|
|
- MICROBLOG_DOMAIN_NAME=""
|
1473
|
|
- fi
|
1474
|
|
- TEST_DOMAIN_NAME=$MICROBLOG_DOMAIN_NAME
|
1475
|
|
- validate_domain_name
|
1476
|
|
- if [[ $TEST_DOMAIN_NAME != $MICROBLOG_DOMAIN_NAME ]]; then
|
1477
|
|
- MICROBLOG_DOMAIN_NAME=
|
1478
|
|
- dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1468
|
+ if [[ $ONION_ONLY != "no" ]]; then
|
|
1469
|
+ MICROBLOG_DOMAIN_NAME='microblog.onion'
|
|
1470
|
+ else
|
|
1471
|
+ MICROBLOG_DETAILS_COMPLETE=
|
|
1472
|
+ while [ ! $MICROBLOG_DETAILS_COMPLETE ]
|
|
1473
|
+ do
|
|
1474
|
+ data=$(tempfile 2>/dev/null)
|
|
1475
|
+ trap "rm -f $data" 0 1 2 5 15
|
|
1476
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1477
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1478
|
+ --title $"Microblog Configuration" \
|
|
1479
|
+ --form $"\nPlease enter your Microblog details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 11 55 3 \
|
|
1480
|
+ $"Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1481
|
+ $"Code:" 2 1 "$(grep 'MICROBLOG_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
|
1482
|
+ 2> $data
|
1479
|
1483
|
else
|
1480
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1481
|
|
- MICROBLOG_CODE=$(cat $data | sed -n 2p)
|
1482
|
|
- if [ ${#MICROBLOG_CODE} -lt 30 ]; then
|
1483
|
|
- MICROBLOG_DOMAIN_NAME=
|
1484
|
|
- dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1484
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1485
|
+ --title $"Microblog Configuration" \
|
|
1486
|
+ --form $"\nPlease enter your Microblog details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 11 55 3 \
|
|
1487
|
+ $"Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1488
|
+ 2> $data
|
|
1489
|
+ fi
|
|
1490
|
+ sel=$?
|
|
1491
|
+ case $sel in
|
|
1492
|
+ 1) exit 1;;
|
|
1493
|
+ 255) exit 1;;
|
|
1494
|
+ esac
|
|
1495
|
+ MICROBLOG_DOMAIN_NAME=$(cat $data | sed -n 1p)
|
|
1496
|
+ if [ $MICROBLOG_DOMAIN_NAME ]; then
|
|
1497
|
+ if [[ $MICROBLOG_DOMAIN_NAME == "$HUBZILLA_DOMAIN_NAME" ]]; then
|
|
1498
|
+ MICROBLOG_DOMAIN_NAME=""
|
|
1499
|
+ fi
|
|
1500
|
+ TEST_DOMAIN_NAME=$MICROBLOG_DOMAIN_NAME
|
|
1501
|
+ validate_domain_name
|
|
1502
|
+ if [[ $TEST_DOMAIN_NAME != $MICROBLOG_DOMAIN_NAME ]]; then
|
|
1503
|
+ MICROBLOG_DOMAIN_NAME=
|
|
1504
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1505
|
+ else
|
|
1506
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1507
|
+ MICROBLOG_CODE=$(cat $data | sed -n 2p)
|
|
1508
|
+ if [ ${#MICROBLOG_CODE} -lt 30 ]; then
|
|
1509
|
+ MICROBLOG_DOMAIN_NAME=
|
|
1510
|
+ dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1511
|
+ fi
|
1485
|
1512
|
fi
|
1486
|
1513
|
fi
|
1487
|
1514
|
fi
|
1488
|
|
- fi
|
1489
|
|
- if [ $MICROBLOG_DOMAIN_NAME ]; then
|
1490
|
|
- MICROBLOG_DETAILS_COMPLETE="yes"
|
1491
|
|
- fi
|
1492
|
|
- done
|
|
1515
|
+ if [ $MICROBLOG_DOMAIN_NAME ]; then
|
|
1516
|
+ MICROBLOG_DETAILS_COMPLETE="yes"
|
|
1517
|
+ fi
|
|
1518
|
+ done
|
|
1519
|
+ fi
|
1493
|
1520
|
save_configuration_file
|
1494
|
1521
|
fi
|
1495
|
1522
|
|
1496
|
1523
|
if [[ $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
|
1497
|
|
- DEVELOPER_DETAILS_COMPLETE=
|
1498
|
|
- while [ ! $DEVELOPER_DETAILS_COMPLETE ]
|
1499
|
|
- do
|
1500
|
|
- data=$(tempfile 2>/dev/null)
|
1501
|
|
- trap "rm -f $data" 0 1 2 5 15
|
|
1524
|
+ if [[ $ONION_ONLY != "no" ]]; then
|
|
1525
|
+ GIT_DOMAIN_NAME='git.onion'
|
|
1526
|
+ else
|
|
1527
|
+ DEVELOPER_DETAILS_COMPLETE=
|
|
1528
|
+ while [ ! $DEVELOPER_DETAILS_COMPLETE ]
|
|
1529
|
+ do
|
|
1530
|
+ data=$(tempfile 2>/dev/null)
|
|
1531
|
+ trap "rm -f $data" 0 1 2 5 15
|
1502
|
1532
|
|
1503
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1504
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1505
|
|
- --title $"Developer Configuration" \
|
1506
|
|
- --form $"\nPlease enter your Git hosting site details.\nIf You don't need developer tools then just select Ok" 11 55 3 \
|
1507
|
|
- $"Domain:" 1 1 "$(grep 'GIT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
1508
|
|
- $"Code:" 2 1 "$(grep 'GIT_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
|
1509
|
|
- 2> $data
|
1510
|
|
- else
|
1511
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1512
|
|
- --title $"Developer Configuration" \
|
1513
|
|
- --form $"\nPlease enter your Git hosting site details.\nIf You don't need developer tools then just select Ok" 11 55 2 \
|
1514
|
|
- $"Domain:" 1 1 "$(grep 'GIT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
1515
|
|
- 2> $data
|
1516
|
|
- fi
|
1517
|
|
- sel=$?
|
1518
|
|
- case $sel in
|
1519
|
|
- 1) exit 1;;
|
1520
|
|
- 255) exit 1;;
|
1521
|
|
- esac
|
1522
|
|
- GIT_DOMAIN_NAME=$(cat $data | sed -n 1p)
|
1523
|
|
- if [ $GIT_DOMAIN_NAME ]; then
|
1524
|
|
- TEST_DOMAIN_NAME=$GIT_DOMAIN_NAME
|
1525
|
|
- validate_domain_name
|
1526
|
|
- if [[ $TEST_DOMAIN_NAME != $GIT_DOMAIN_NAME ]]; then
|
1527
|
|
- GIT_DOMAIN_NAME=
|
1528
|
|
- dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1533
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1534
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1535
|
+ --title $"Developer Configuration" \
|
|
1536
|
+ --form $"\nPlease enter your Git hosting site details.\nIf You don't need developer tools then just select Ok" 11 55 3 \
|
|
1537
|
+ $"Domain:" 1 1 "$(grep 'GIT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
|
1538
|
+ $"Code:" 2 1 "$(grep 'GIT_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
|
|
1539
|
+ 2> $data
|
1529
|
1540
|
else
|
1530
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1531
|
|
- GIT_CODE=$(cat $data | sed -n 2p)
|
1532
|
|
- if [ ${#GIT_CODE} -lt 30 ]; then
|
1533
|
|
- GIT_DOMAIN_NAME=
|
1534
|
|
- dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1541
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1542
|
+ --title $"Developer Configuration" \
|
|
1543
|
+ --form $"\nPlease enter your Git hosting site details.\nIf You don't need developer tools then just select Ok" 11 55 2 \
|
|
1544
|
+ $"Domain:" 1 1 "$(grep 'GIT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
|
1545
|
+ 2> $data
|
|
1546
|
+ fi
|
|
1547
|
+ sel=$?
|
|
1548
|
+ case $sel in
|
|
1549
|
+ 1) exit 1;;
|
|
1550
|
+ 255) exit 1;;
|
|
1551
|
+ esac
|
|
1552
|
+ GIT_DOMAIN_NAME=$(cat $data | sed -n 1p)
|
|
1553
|
+ if [ $GIT_DOMAIN_NAME ]; then
|
|
1554
|
+ TEST_DOMAIN_NAME=$GIT_DOMAIN_NAME
|
|
1555
|
+ validate_domain_name
|
|
1556
|
+ if [[ $TEST_DOMAIN_NAME != $GIT_DOMAIN_NAME ]]; then
|
|
1557
|
+ GIT_DOMAIN_NAME=
|
|
1558
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1559
|
+ else
|
|
1560
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1561
|
+ GIT_CODE=$(cat $data | sed -n 2p)
|
|
1562
|
+ if [ ${#GIT_CODE} -lt 30 ]; then
|
|
1563
|
+ GIT_DOMAIN_NAME=
|
|
1564
|
+ dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1565
|
+ fi
|
1535
|
1566
|
fi
|
1536
|
1567
|
fi
|
|
1568
|
+ else
|
|
1569
|
+ DEVELOPER_DETAILS_COMPLETE="yes"
|
1537
|
1570
|
fi
|
1538
|
|
- else
|
1539
|
|
- DEVELOPER_DETAILS_COMPLETE="yes"
|
1540
|
|
- fi
|
1541
|
|
- if [ $GIT_DOMAIN_NAME ]; then
|
1542
|
|
- DEVELOPER_DETAILS_COMPLETE="yes"
|
1543
|
|
- fi
|
1544
|
|
- done
|
|
1571
|
+ if [ $GIT_DOMAIN_NAME ]; then
|
|
1572
|
+ DEVELOPER_DETAILS_COMPLETE="yes"
|
|
1573
|
+ fi
|
|
1574
|
+ done
|
|
1575
|
+ fi
|
1545
|
1576
|
save_configuration_file
|
1546
|
1577
|
fi
|
1547
|
1578
|
|
1548
|
1579
|
if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
|
1549
|
|
- DEFAULT_DOMAIN_DETAILS_COMPLETE=
|
1550
|
|
- while [ ! $DEFAULT_DOMAIN_DETAILS_COMPLETE ]
|
1551
|
|
- do
|
1552
|
|
- data=$(tempfile 2>/dev/null)
|
1553
|
|
- trap "rm -f $data" 0 1 2 5 15
|
1554
|
|
- if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1555
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1556
|
|
- --title $"Your main domain name" \
|
1557
|
|
- --form $"\nWhich domain name should your email/XMPP/IRC/VoIP be associated with?" 11 55 3 \
|
1558
|
|
- $"Domain:" 1 1 "$(grep 'DEFAULT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1559
|
|
- $"Code:" 2 1 "$(grep 'DEFAULT_DOMAIN_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
1560
|
|
- 2> $data
|
1561
|
|
- sel=$?
|
1562
|
|
- case $sel in
|
1563
|
|
- 1) exit 1;;
|
1564
|
|
- 255) exit 1;;
|
1565
|
|
- esac
|
1566
|
|
- DEFAULT_DOMAIN_NAME=$(cat $data | sed -n 1p)
|
1567
|
|
- DEFAULT_DOMAIN_CODE=$(cat $data | sed -n 2p)
|
|
1580
|
+ if [[ $ONION_ONLY != "no" ]]; then
|
|
1581
|
+ DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.onion"
|
|
1582
|
+ else
|
|
1583
|
+ DEFAULT_DOMAIN_DETAILS_COMPLETE=
|
|
1584
|
+ while [ ! $DEFAULT_DOMAIN_DETAILS_COMPLETE ]
|
|
1585
|
+ do
|
|
1586
|
+ data=$(tempfile 2>/dev/null)
|
|
1587
|
+ trap "rm -f $data" 0 1 2 5 15
|
|
1588
|
+ if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
|
1589
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1590
|
+ --title $"Your main domain name" \
|
|
1591
|
+ --form $"\nWhich domain name should your email/XMPP/IRC/VoIP be associated with?" 11 55 3 \
|
|
1592
|
+ $"Domain:" 1 1 "$(grep 'DEFAULT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1593
|
+ $"Code:" 2 1 "$(grep 'DEFAULT_DOMAIN_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
|
1594
|
+ 2> $data
|
|
1595
|
+ sel=$?
|
|
1596
|
+ case $sel in
|
|
1597
|
+ 1) exit 1;;
|
|
1598
|
+ 255) exit 1;;
|
|
1599
|
+ esac
|
|
1600
|
+ DEFAULT_DOMAIN_NAME=$(cat $data | sed -n 1p)
|
|
1601
|
+ DEFAULT_DOMAIN_CODE=$(cat $data | sed -n 2p)
|
|
1602
|
+ if [ $DEFAULT_DOMAIN_NAME ]; then
|
|
1603
|
+ if [ ${#DEFAULT_DOMAIN_CODE} -lt 30 ]; then
|
|
1604
|
+ DEFAULT_DOMAIN_NAME=
|
|
1605
|
+ dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1606
|
+ fi
|
|
1607
|
+ fi
|
|
1608
|
+ else
|
|
1609
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1610
|
+ --inputbox $"Which domain name should your email/XMPP/IRC/VoIP be associated with?" 10 45 \
|
|
1611
|
+ "$(grep 'DEFAULT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
|
1612
|
+ sel=$?
|
|
1613
|
+ case $sel in
|
|
1614
|
+ 0) DEFAULT_DOMAIN_NAME=$(cat $data);;
|
|
1615
|
+ 1) exit 1;;
|
|
1616
|
+ 255) exit 1;;
|
|
1617
|
+ esac
|
|
1618
|
+ fi
|
1568
|
1619
|
if [ $DEFAULT_DOMAIN_NAME ]; then
|
1569
|
|
- if [ ${#DEFAULT_DOMAIN_CODE} -lt 30 ]; then
|
|
1620
|
+ TEST_DOMAIN_NAME=$DEFAULT_DOMAIN_NAME
|
|
1621
|
+ validate_domain_name
|
|
1622
|
+ if [[ $TEST_DOMAIN_NAME != $DEFAULT_DOMAIN_NAME ]]; then
|
1570
|
1623
|
DEFAULT_DOMAIN_NAME=
|
1571
|
|
- dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1624
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1625
|
+ else
|
|
1626
|
+ DEFAULT_DOMAIN_DETAILS_COMPLETE="yes"
|
1572
|
1627
|
fi
|
1573
|
1628
|
fi
|
1574
|
|
- else
|
|
1629
|
+ done
|
|
1630
|
+ fi
|
|
1631
|
+ save_configuration_file
|
|
1632
|
+
|
|
1633
|
+ if [[ $ONION_ONLY != "no" ]]; then
|
|
1634
|
+ EMAIL_ADDRESS=$MY_USERNAME@$DEFAULT_DOMAIN_NAME
|
|
1635
|
+ else
|
|
1636
|
+ while [ ${#MY_EMAIL_ADDRESS} -lt 5 ]
|
|
1637
|
+ do
|
|
1638
|
+ EMAIL_ADDRESS=$(grep 'MY_EMAIL_ADDRESS' temp.cfg | awk -F '=' '{print $2}')
|
|
1639
|
+ if [ ! $EMAIL_ADDRESS ]; then
|
|
1640
|
+ EMAIL_ADDRESS=$MY_USERNAME@$DEFAULT_DOMAIN_NAME
|
|
1641
|
+ fi
|
|
1642
|
+ if [ ${#MY_EMAIL_ADDRESS} -lt 5 ]; then
|
|
1643
|
+ EMAIL_ADDRESS=$MY_USERNAME@$DEFAULT_DOMAIN_NAME
|
|
1644
|
+ fi
|
|
1645
|
+
|
|
1646
|
+ data=$(tempfile 2>/dev/null)
|
|
1647
|
+ trap "rm -f $data" 0 1 2 5 15
|
1575
|
1648
|
dialog --backtitle $"Freedombone Configuration" \
|
1576
|
|
- --inputbox $"Which domain name should your email/XMPP/IRC/VoIP be associated with?" 10 45 \
|
1577
|
|
- "$(grep 'DEFAULT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
|
1649
|
+ --inputbox $"Your email address" 10 30 "$EMAIL_ADDRESS" 2> $data
|
1578
|
1650
|
sel=$?
|
1579
|
1651
|
case $sel in
|
1580
|
|
- 0) DEFAULT_DOMAIN_NAME=$(cat $data);;
|
|
1652
|
+ 0) MY_EMAIL_ADDRESS=$(cat $data);;
|
1581
|
1653
|
1) exit 1;;
|
1582
|
1654
|
255) exit 1;;
|
1583
|
1655
|
esac
|
1584
|
|
- fi
|
1585
|
|
- if [ $DEFAULT_DOMAIN_NAME ]; then
|
1586
|
|
- TEST_DOMAIN_NAME=$DEFAULT_DOMAIN_NAME
|
1587
|
|
- validate_domain_name
|
1588
|
|
- if [[ $TEST_DOMAIN_NAME != $DEFAULT_DOMAIN_NAME ]]; then
|
1589
|
|
- DEFAULT_DOMAIN_NAME=
|
1590
|
|
- dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
1591
|
|
- else
|
1592
|
|
- DEFAULT_DOMAIN_DETAILS_COMPLETE="yes"
|
1593
|
|
- fi
|
1594
|
|
- fi
|
1595
|
|
- done
|
1596
|
|
- save_configuration_file
|
1597
|
|
-
|
1598
|
|
- while [ ${#MY_EMAIL_ADDRESS} -lt 5 ]
|
1599
|
|
- do
|
1600
|
|
- EMAIL_ADDRESS=$(grep 'MY_EMAIL_ADDRESS' temp.cfg | awk -F '=' '{print $2}')
|
1601
|
|
- if [ ! $EMAIL_ADDRESS ]; then
|
1602
|
|
- EMAIL_ADDRESS=$MY_USERNAME@$DEFAULT_DOMAIN_NAME
|
1603
|
|
- fi
|
1604
|
|
- if [ ${#MY_EMAIL_ADDRESS} -lt 5 ]; then
|
1605
|
|
- EMAIL_ADDRESS=$MY_USERNAME@$DEFAULT_DOMAIN_NAME
|
1606
|
|
- fi
|
1607
|
|
-
|
1608
|
|
- data=$(tempfile 2>/dev/null)
|
1609
|
|
- trap "rm -f $data" 0 1 2 5 15
|
1610
|
|
- dialog --backtitle $"Freedombone Configuration" \
|
1611
|
|
- --inputbox $"Your email address" 10 30 "$EMAIL_ADDRESS" 2> $data
|
1612
|
|
- sel=$?
|
1613
|
|
- case $sel in
|
1614
|
|
- 0) MY_EMAIL_ADDRESS=$(cat $data);;
|
1615
|
|
- 1) exit 1;;
|
1616
|
|
- 255) exit 1;;
|
1617
|
|
- esac
|
1618
|
|
- done
|
|
1656
|
+ done
|
|
1657
|
+ fi
|
1619
|
1658
|
save_configuration_file
|
1620
|
1659
|
fi
|
1621
|
1660
|
|
|
@@ -1768,6 +1807,9 @@ function read_configuration {
|
1768
|
1807
|
if grep -q "WIFI_CHANNEL" $CONFIGURATION_FILE; then
|
1769
|
1808
|
WIFI_CHANNEL=$(grep "WIFI_CHANNEL" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
1770
|
1809
|
fi
|
|
1810
|
+ if grep -q "ONION_ONLY" $CONFIGURATION_FILE; then
|
|
1811
|
+ ONION_ONLY=$(grep "ONION_ONLY" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
1812
|
+ fi
|
1771
|
1813
|
fi
|
1772
|
1814
|
}
|
1773
|
1815
|
|