Quellcode durchsuchen

Changes relating to the mesh variant

Bob Mottram vor 9 Jahren
Ursprung
Commit
ca9f338d68
1 geänderte Dateien mit 35 neuen und 17 gelöschten Zeilen
  1. 35
    17
      src/freedombone

+ 35
- 17
src/freedombone Datei anzeigen

@@ -690,9 +690,11 @@ function parse_args {
690 690
       exit 1
691 691
   fi
692 692
   if [ ! "$DEFAULT_DOMAIN_NAME" ]; then
693
-      echo 'No default domain specified'
694
-      show_help
695
-      exit 2
693
+      if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
694
+          echo 'No default domain specified'
695
+          show_help
696
+          exit 2
697
+      fi
696 698
   fi
697 699
   if [ ! $MY_USERNAME ]; then
698 700
       echo 'No username specified'
@@ -3113,6 +3115,9 @@ function create_freedns_updater {
3113 3115
   if [[ $DDNS_PROVIDER != "default@freedns.afraid.org" ]]; then
3114 3116
       return
3115 3117
   fi
3118
+  if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
3119
+      return
3120
+  fi
3116 3121
 
3117 3122
   FREEDNS_WGET='wget -q --read-timeout=0.0 --waitretry=5 --tries=4 https://freedns.afraid.org/dynamic/update.php?'
3118 3123
 
@@ -5251,6 +5256,10 @@ function set_your_domain_name {
5251 5256
   if grep -Fxq "set_your_domain_name" $COMPLETION_FILE; then
5252 5257
       return
5253 5258
   fi
5259
+  if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
5260
+      return
5261
+  fi
5262
+
5254 5263
   echo "$DEFAULT_DOMAIN_NAME" > /etc/hostname
5255 5264
   hostname $DEFAULT_DOMAIN_NAME
5256 5265
   if grep -q "127.0.1.1" /etc/hosts; then
@@ -5683,7 +5692,7 @@ function configure_internet_protocol {
5683 5692
 }
5684 5693
 
5685 5694
 function configure_email {
5686
-  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then
5695
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
5687 5696
       return
5688 5697
   fi
5689 5698
   if grep -Fxq "configure_email" $COMPLETION_FILE; then
@@ -5791,7 +5800,7 @@ function configure_email {
5791 5800
 }
5792 5801
 
5793 5802
 function create_procmail {
5794
-  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" ]]; then
5803
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
5795 5804
       return
5796 5805
   fi
5797 5806
   if grep -Fxq "create_procmail" $COMPLETION_FILE; then
@@ -5807,7 +5816,7 @@ function create_procmail {
5807 5816
 }
5808 5817
 
5809 5818
 function spam_filtering {
5810
-  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" ]]; then
5819
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
5811 5820
       return
5812 5821
   fi
5813 5822
   if grep -Fxq "spam_filtering" $COMPLETION_FILE; then
@@ -5941,7 +5950,7 @@ function spam_filtering {
5941 5950
 }
5942 5951
 
5943 5952
 function configure_imap {
5944
-  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" ]]; then
5953
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
5945 5954
       return
5946 5955
   fi
5947 5956
   if grep -Fxq "configure_imap" $COMPLETION_FILE; then
@@ -6019,6 +6028,9 @@ function configure_imap {
6019 6028
 }
6020 6029
 
6021 6030
 function configure_imap_client_certs {
6031
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
6032
+      return
6033
+  fi
6022 6034
   if grep -Fxq "configure_imap_client_certs" $COMPLETION_FILE; then
6023 6035
       return
6024 6036
   fi
@@ -6092,6 +6104,9 @@ function configure_imap_client_certs {
6092 6104
 }
6093 6105
 
6094 6106
 function configure_gpg {
6107
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
6108
+      return
6109
+  fi
6095 6110
   if grep -Fxq "configure_gpg" $COMPLETION_FILE; then
6096 6111
       return
6097 6112
   fi
@@ -6197,7 +6212,7 @@ function encrypt_incoming_email {
6197 6212
   # encrypts incoming mail using your GPG public key
6198 6213
   # so even if an attacker gains access to the data at rest they still need
6199 6214
   # to know your GPG key password to be able to read anything
6200
-  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" ]]; then
6215
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
6201 6216
       return
6202 6217
   fi
6203 6218
   if grep -Fxq "encrypt_incoming_email" $COMPLETION_FILE; then
@@ -6228,7 +6243,7 @@ function encrypt_outgoing_email {
6228 6243
   # encrypts outgoing mail using your GPG public key
6229 6244
   # so even if an attacker gains access to the data at rest they still need
6230 6245
   # to know your GPG key password to be able to read sent mail
6231
-  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" ]]; then
6246
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
6232 6247
       return
6233 6248
   fi
6234 6249
   if grep -Fxq "encrypt_outgoing_email" $COMPLETION_FILE; then
@@ -6272,7 +6287,7 @@ function encrypt_outgoing_email {
6272 6287
 }
6273 6288
 
6274 6289
 function encrypt_all_email {
6275
-  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" ]]; then
6290
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
6276 6291
       return
6277 6292
   fi
6278 6293
   if grep -Fxq "encrypt_all_email" $COMPLETION_FILE; then
@@ -6407,7 +6422,7 @@ function encrypt_all_email {
6407 6422
 }
6408 6423
 
6409 6424
 function email_client {
6410
-  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" ]]; then
6425
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
6411 6426
       return
6412 6427
   fi
6413 6428
   if grep -Fxq "email_client" $COMPLETION_FILE; then
@@ -6540,7 +6555,7 @@ function email_client {
6540 6555
 }
6541 6556
 
6542 6557
 function email_archiving {
6543
-  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" ]]; then
6558
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
6544 6559
       return
6545 6560
   fi
6546 6561
   if grep -Fxq "email_archiving" $COMPLETION_FILE; then
@@ -6590,7 +6605,7 @@ function email_from_address {
6590 6605
 }
6591 6606
 
6592 6607
 function create_public_mailing_list {
6593
-  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" ]]; then
6608
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
6594 6609
       return
6595 6610
   fi
6596 6611
   if grep -Fxq "create_public_mailing_list" $COMPLETION_FILE; then
@@ -6688,7 +6703,7 @@ function create_public_mailing_list {
6688 6703
 }
6689 6704
 
6690 6705
 function create_private_mailing_list {
6691
-  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" ]]; then
6706
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
6692 6707
       return
6693 6708
   fi
6694 6709
   # This installation doesn't work, results in ruby errors
@@ -6761,7 +6776,7 @@ function split_gpg_key_into_fragments {
6761 6776
 }
6762 6777
 
6763 6778
 function import_email {
6764
-  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" ]]; then
6779
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
6765 6780
       return
6766 6781
   fi
6767 6782
   EMAIL_COMPLETE_MSG='  *** Freedombone mailbox installation is complete ***'
@@ -6814,7 +6829,7 @@ function import_email {
6814 6829
 }
6815 6830
 
6816 6831
 function install_web_server {
6817
-  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" ]]; then
6832
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
6818 6833
       return
6819 6834
   fi
6820 6835
   if grep -Fxq "install_web_server" $COMPLETION_FILE; then
@@ -7405,7 +7420,7 @@ quit" > $INSTALL_DIR/batch.sql
7405 7420
 }
7406 7421
 
7407 7422
 function install_gogs {
7408
-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_CHAT" ]]; then
7423
+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
7409 7424
       return
7410 7425
   fi
7411 7426
   if grep -Fxq "install_gogs" $COMPLETION_FILE; then
@@ -9565,6 +9580,9 @@ function backup_github_projects {
9565 9580
 }
9566 9581
 
9567 9582
 function install_dynamicdns {
9583
+  if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
9584
+      return
9585
+  fi
9568 9586
   if grep -Fxq "install_dynamicdns" $COMPLETION_FILE; then
9569 9587
       return
9570 9588
   fi