Quellcode durchsuchen

Preparing interactive configuration for Hubzilla

Bob Mottram vor 9 Jahren
Ursprung
Commit
a17ed9867e
1 geänderte Dateien mit 111 neuen und 41 gelöschten Zeilen
  1. 111
    41
      src/freedombone-config

+ 111
- 41
src/freedombone-config Datei anzeigen

@@ -31,6 +31,9 @@
31 31
 
32 32
 NO_OF_ARGS=$#
33 33
 
34
+# whether to enable hubzilla or redmatrix
35
+ENABLE_HUBZILLA="no"
36
+
34 37
 # Web site
35 38
 FREEDOMBONE_WEBSITE="http://freedombone.uk.to"
36 39
 
@@ -82,6 +85,8 @@ OWNCLOUD_DOMAIN_NAME=
82 85
 OWNCLOUD_CODE=
83 86
 REDMATRIX_DOMAIN_NAME=
84 87
 REDMATRIX_CODE=
88
+HUBZILLA_DOMAIN_NAME=
89
+HUBZILLA_CODE=
85 90
 MICROBLOG_DOMAIN_NAME=
86 91
 MICROBLOG_CODE=
87 92
 GIT_DOMAIN_NAME=
@@ -213,6 +218,12 @@ function save_configuration_file {
213 218
   if [ $REDMATRIX_CODE ]; then
214 219
       echo "REDMATRIX_CODE=$REDMATRIX_CODE" >> $CONFIGURATION_FILE
215 220
   fi
221
+  if [ $HUBZILLA_DOMAIN_NAME ]; then
222
+      echo "HUBZILLA_DOMAIN_NAME=$HUBZILLA_DOMAIN_NAME" >> $CONFIGURATION_FILE
223
+  fi
224
+  if [ $HUBZILLA_CODE ]; then
225
+      echo "HUBZILLA_CODE=$HUBZILLA_CODE" >> $CONFIGURATION_FILE
226
+  fi
216 227
   if [ $MICROBLOG_DOMAIN_NAME ]; then
217 228
       echo "MICROBLOG_DOMAIN_NAME=$MICROBLOG_DOMAIN_NAME" >> $CONFIGURATION_FILE
218 229
   fi
@@ -1223,51 +1234,101 @@ function interactive_configuration {
1223 1234
   fi
1224 1235
 
1225 1236
   if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
1226
-      REDMATRIX_DETAILS_COMPLETE=
1227
-      while [ ! $REDMATRIX_DETAILS_COMPLETE ]
1228
-      do
1229
-          data=$(tempfile 2>/dev/null)
1230
-          trap "rm -f $data" 0 1 2 5 15
1231
-          if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
1232
-              dialog --backtitle "Freedombone Configuration" \
1233
-                     --title "RedMatrix Configuration" \
1234
-                     --form "\nPlease enter your RedMatrix details:" 11 55 3 \
1235
-                     "Domain:" 1 1 "$(grep 'REDMATRIX_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
1236
-                     "Code:" 2 1 "$(grep 'REDMATRIX_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
1237
-                     2> $data
1238
-          else
1239
-              dialog --backtitle "Freedombone Configuration" \
1240
-                     --title "RedMatrix Configuration" \
1241
-                     --form "\nPlease enter your RedMatrix details:" 11 55 3 \
1242
-                     "Domain:" 1 1 "$(grep 'REDMATRIX_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
1243
-                     2> $data
1244
-          fi
1245
-          sel=$?
1246
-          case $sel in
1247
-              1) exit 1;;
1248
-              255) exit 1;;
1249
-          esac
1250
-          REDMATRIX_DOMAIN_NAME=$(cat $data | sed -n 1p)
1251
-          if [ $REDMATRIX_DOMAIN_NAME ]; then
1252
-              TEST_DOMAIN_NAME=$REDMATRIX_DOMAIN_NAME
1253
-              validate_domain_name
1254
-              if [[ $TEST_DOMAIN_NAME != $REDMATRIX_DOMAIN_NAME ]]; then
1255
-                  REDMATRIX_DOMAIN_NAME=
1256
-                  dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
1237
+      if [[ $ENABLE_HUBZILLA == "no" ]]; then
1238
+          REDMATRIX_DETAILS_COMPLETE=
1239
+          while [ ! $REDMATRIX_DETAILS_COMPLETE ]
1240
+          do
1241
+              data=$(tempfile 2>/dev/null)
1242
+              trap "rm -f $data" 0 1 2 5 15
1243
+              if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
1244
+                  dialog --backtitle "Freedombone Configuration" \
1245
+                         --title "RedMatrix Configuration" \
1246
+                         --form "\nPlease enter your RedMatrix details:" 11 55 3 \
1247
+                         "Domain:" 1 1 "$(grep 'REDMATRIX_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
1248
+                         "Code:" 2 1 "$(grep 'REDMATRIX_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
1249
+                         2> $data
1257 1250
               else
1258
-                  if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
1259
-                      REDMATRIX_CODE=$(cat $data | sed -n 2p)
1260
-                      if [ ${#REDMATRIX_CODE} -lt 30 ]; then
1261
-                          REDMATRIX_DOMAIN_NAME=
1262
-                          dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1251
+                  dialog --backtitle "Freedombone Configuration" \
1252
+                         --title "RedMatrix Configuration" \
1253
+                         --form "\nPlease enter your RedMatrix details:" 11 55 3 \
1254
+                         "Domain:" 1 1 "$(grep 'REDMATRIX_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
1255
+                         2> $data
1256
+              fi
1257
+              sel=$?
1258
+              case $sel in
1259
+                  1) exit 1;;
1260
+                  255) exit 1;;
1261
+              esac
1262
+              REDMATRIX_DOMAIN_NAME=$(cat $data | sed -n 1p)
1263
+              if [ $REDMATRIX_DOMAIN_NAME ]; then
1264
+                  TEST_DOMAIN_NAME=$REDMATRIX_DOMAIN_NAME
1265
+                  validate_domain_name
1266
+                  if [[ $TEST_DOMAIN_NAME != $REDMATRIX_DOMAIN_NAME ]]; then
1267
+                      REDMATRIX_DOMAIN_NAME=
1268
+                      dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
1269
+                  else
1270
+                      if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
1271
+                          REDMATRIX_CODE=$(cat $data | sed -n 2p)
1272
+                          if [ ${#REDMATRIX_CODE} -lt 30 ]; then
1273
+                              REDMATRIX_DOMAIN_NAME=
1274
+                              dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1275
+                          fi
1263 1276
                       fi
1264 1277
                   fi
1265 1278
               fi
1266
-          fi
1267
-          if [ $REDMATRIX_DOMAIN_NAME ]; then
1268
-              REDMATRIX_DETAILS_COMPLETE="yes"
1269
-          fi
1270
-      done
1279
+              if [ $REDMATRIX_DOMAIN_NAME ]; then
1280
+                  REDMATRIX_DETAILS_COMPLETE="yes"
1281
+              fi
1282
+          done
1283
+
1284
+      else
1285
+
1286
+          HUBZILLA_DETAILS_COMPLETE=
1287
+          while [ ! $HUBZILLA_DETAILS_COMPLETE ]
1288
+          do
1289
+              data=$(tempfile 2>/dev/null)
1290
+              trap "rm -f $data" 0 1 2 5 15
1291
+              if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
1292
+                  dialog --backtitle "Freedombone Configuration" \
1293
+                         --title "Hubzilla Configuration" \
1294
+                         --form "\nPlease enter your Hubzilla details:" 11 55 3 \
1295
+                         "Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
1296
+                         "Code:" 2 1 "$(grep 'HUBZILLA_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
1297
+                         2> $data
1298
+              else
1299
+                  dialog --backtitle "Freedombone Configuration" \
1300
+                         --title "Hubzilla Configuration" \
1301
+                         --form "\nPlease enter your Hubzilla details:" 11 55 3 \
1302
+                         "Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
1303
+                         2> $data
1304
+              fi
1305
+              sel=$?
1306
+              case $sel in
1307
+                  1) exit 1;;
1308
+                  255) exit 1;;
1309
+              esac
1310
+              HUBZILLA_DOMAIN_NAME=$(cat $data | sed -n 1p)
1311
+              if [ $HUBZILLA_DOMAIN_NAME ]; then
1312
+                  TEST_DOMAIN_NAME=$HUBZILLA_DOMAIN_NAME
1313
+                  validate_domain_name
1314
+                  if [[ $TEST_DOMAIN_NAME != $HUBZILLA_DOMAIN_NAME ]]; then
1315
+                      HUBZILLA_DOMAIN_NAME=
1316
+                      dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
1317
+                  else
1318
+                      if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
1319
+                          HUBZILLA_CODE=$(cat $data | sed -n 2p)
1320
+                          if [ ${#HUBZILLA_CODE} -lt 30 ]; then
1321
+                              HUBZILLA_DOMAIN_NAME=
1322
+                              dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1323
+                          fi
1324
+                      fi
1325
+                  fi
1326
+              fi
1327
+              if [ $HUBZILLA_DOMAIN_NAME ]; then
1328
+                  HUBZILLA_DETAILS_COMPLETE="yes"
1329
+              fi
1330
+          done
1331
+      fi
1271 1332
       save_configuration_file
1272 1333
   fi
1273 1334
 
@@ -1301,6 +1362,9 @@ function interactive_configuration {
1301 1362
               if [[ $MICROBLOG_DOMAIN_NAME == "$REDMATRIX_DOMAIN_NAME" ]]; then
1302 1363
                   MICROBLOG_DOMAIN_NAME=""
1303 1364
               fi
1365
+              if [[ $MICROBLOG_DOMAIN_NAME == "$HUBZILLA_DOMAIN_NAME" ]]; then
1366
+                  MICROBLOG_DOMAIN_NAME=""
1367
+              fi
1304 1368
               TEST_DOMAIN_NAME=$MICROBLOG_DOMAIN_NAME
1305 1369
               validate_domain_name
1306 1370
               if [[ $TEST_DOMAIN_NAME != $MICROBLOG_DOMAIN_NAME ]]; then
@@ -1558,6 +1622,12 @@ function read_configuration {
1558 1622
       if grep -q "REDMATRIX_CODE" $CONFIGURATION_FILE; then
1559 1623
           REDMATRIX_CODE=$(grep "REDMATRIX_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1560 1624
       fi
1625
+      if grep -q "HUBZILLA_DOMAIN_NAME" $CONFIGURATION_FILE; then
1626
+          HUBZILLA_DOMAIN_NAME=$(grep "HUBZILLA_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1627
+      fi
1628
+      if grep -q "HUBZILLA_CODE" $CONFIGURATION_FILE; then
1629
+          HUBZILLA_CODE=$(grep "HUBZILLA_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1630
+      fi
1561 1631
       if grep -q "OWNCLOUD_DOMAIN_NAME" $CONFIGURATION_FILE; then
1562 1632
           OWNCLOUD_DOMAIN_NAME=$(grep "OWNCLOUD_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1563 1633
       fi