Quellcode durchsuchen

Hubzilla install switch

Bob Mottram vor 9 Jahren
Ursprung
Commit
5a59db6549
2 geänderte Dateien mit 19 neuen und 1 gelöschten Zeilen
  1. 13
    1
      src/freedombone
  2. 6
    0
      src/freedombone-config

+ 13
- 1
src/freedombone Datei anzeigen

42
 # Version number of this script
42
 # Version number of this script
43
 VERSION="1.01"
43
 VERSION="1.01"
44
 
44
 
45
+# whether to enable hubzilla or redmatrix
46
+ENABLE_HUBZILLA="no"
47
+
45
 # Different system variants which may be specified within
48
 # Different system variants which may be specified within
46
 # the SYSTEM_TYPE option
49
 # the SYSTEM_TYPE option
47
 VARIANT_FULL="full"
50
 VARIANT_FULL="full"
789
   fi
792
   fi
790
 
793
 
791
   if [ -f $CONFIGURATION_FILE ]; then
794
   if [ -f $CONFIGURATION_FILE ]; then
795
+      if grep -q "ENABLE_HUBZILLA" $CONFIGURATION_FILE; then
796
+          ENABLE_HUBZILLA=$(grep "ENABLE_HUBZILLA" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
797
+      fi
792
       if grep -q "TRACKER_PORT" $CONFIGURATION_FILE; then
798
       if grep -q "TRACKER_PORT" $CONFIGURATION_FILE; then
793
           TRACKER_PORT=$(grep "TRACKER_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
799
           TRACKER_PORT=$(grep "TRACKER_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
794
       fi
800
       fi
9869
   if [ ! $REDMATRIX_DOMAIN_NAME ]; then
9875
   if [ ! $REDMATRIX_DOMAIN_NAME ]; then
9870
       return
9876
       return
9871
   fi
9877
   fi
9878
+  if [[ $ENABLE_HUBZILLA != "no" ]]; then
9879
+      return
9880
+  fi
9872
 
9881
 
9873
   install_mariadb
9882
   install_mariadb
9874
   get_mariadb_password
9883
   get_mariadb_password
10135
   if [ ! $HUBZILLA_DOMAIN_NAME ]; then
10144
   if [ ! $HUBZILLA_DOMAIN_NAME ]; then
10136
       return
10145
       return
10137
   fi
10146
   fi
10147
+  if [[ $ENABLE_HUBZILLA == "no" ]]; then
10148
+      return
10149
+  fi
10138
 
10150
 
10139
   install_mariadb
10151
   install_mariadb
10140
   get_mariadb_password
10152
   get_mariadb_password
11259
 install_blog
11271
 install_blog
11260
 install_gnu_social
11272
 install_gnu_social
11261
 install_redmatrix
11273
 install_redmatrix
11262
-#install_hubzilla
11274
+install_hubzilla
11263
 install_dlna_server
11275
 install_dlna_server
11264
 configure_firewall_for_dlna
11276
 configure_firewall_for_dlna
11265
 install_mediagoblin
11277
 install_mediagoblin

+ 6
- 0
src/freedombone-config Datei anzeigen

260
   if [ $DH_KEYLENGTH ]; then
260
   if [ $DH_KEYLENGTH ]; then
261
       echo "DH_KEYLENGTH=$DH_KEYLENGTH" >> $CONFIGURATION_FILE
261
       echo "DH_KEYLENGTH=$DH_KEYLENGTH" >> $CONFIGURATION_FILE
262
   fi
262
   fi
263
+  if [ $ENABLE_HUBZILLA ]; then
264
+      echo "ENABLE_HUBZILLA=$ENABLE_HUBZILLA" >> $CONFIGURATION_FILE
265
+  fi
263
 }
266
 }
264
 
267
 
265
 # test a domain name to see if it's valid
268
 # test a domain name to see if it's valid
1536
   fi
1539
   fi
1537
 
1540
 
1538
   if [ -f $CONFIGURATION_FILE ]; then
1541
   if [ -f $CONFIGURATION_FILE ]; then
1542
+      if grep -q "ENABLE_HUBZILLA" $CONFIGURATION_FILE; then
1543
+          ENABLE_HUBZILLA=$(grep "ENABLE_HUBZILLA" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1544
+      fi
1539
       if grep -q "ENABLE_SOCIAL_KEY_MANAGEMENT" $CONFIGURATION_FILE; then
1545
       if grep -q "ENABLE_SOCIAL_KEY_MANAGEMENT" $CONFIGURATION_FILE; then
1540
           ENABLE_SOCIAL_KEY_MANAGEMENT=$(grep "ENABLE_SOCIAL_KEY_MANAGEMENT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1546
           ENABLE_SOCIAL_KEY_MANAGEMENT=$(grep "ENABLE_SOCIAL_KEY_MANAGEMENT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1541
       fi
1547
       fi