Преглед изворни кода

Handle onion only installs of matrix

Bob Mottram пре 8 година
родитељ
комит
51ab10094e
2 измењених фајлова са 23 додато и 2 уклоњено
  1. 18
    0
      src/freedombone-app-matrix
  2. 5
    2
      src/freedombone-utils-turn

+ 18
- 0
src/freedombone-app-matrix Прегледај датотеку

59
         proxy_buffering on; \
59
         proxy_buffering on; \
60
     }'
60
     }'
61
 
61
 
62
+    if [[ $ONION_ONLY != 'no' ]]; then
63
+        matrix_proxy_str=' \
64
+    location /matrix { \
65
+        proxy_pass http://localhost:8448; \
66
+        proxy_buffering on; \
67
+    }'
68
+        turn_proxy_str=' \
69
+    location /turn { \
70
+        proxy_pass http://localhost:3478; \
71
+        proxy_buffering on; \
72
+    }'
73
+    fi
74
+
62
     if [ ! -f /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} ]; then
75
     if [ ! -f /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} ]; then
63
         matrix_nginx_site=/etc/nginx/sites-available/$DEFAULT_DOMAIN_NAME
76
         matrix_nginx_site=/etc/nginx/sites-available/$DEFAULT_DOMAIN_NAME
64
         if [[ $ONION_ONLY == "no" ]]; then
77
         if [[ $ONION_ONLY == "no" ]]; then
450
     groupadd matrix
463
     groupadd matrix
451
     useradd -c "Matrix system account" -d $MATRIX_DATA_DIR -m -r -g matrix matrix
464
     useradd -c "Matrix system account" -d $MATRIX_DATA_DIR -m -r -g matrix matrix
452
 
465
 
466
+    chmod -R 700 /var/lib/matrix/homeserver.yaml
453
     chown -R matrix:matrix /etc/matrix
467
     chown -R matrix:matrix /etc/matrix
454
     chown -R matrix:matrix $MATRIX_DATA_DIR
468
     chown -R matrix:matrix $MATRIX_DATA_DIR
455
 
469
 
471
     systemctl daemon-reload
485
     systemctl daemon-reload
472
     systemctl start matrix
486
     systemctl start matrix
473
 
487
 
488
+    if [ -f /var/lib/matrix/homeserver.db ]; then
489
+        chmod -R 700 /var/lib/matrix/homeserver.db
490
+    fi
491
+
474
     update_default_domain
492
     update_default_domain
475
 
493
 
476
     firewall_add matrix ${MATRIX_PORT}
494
     firewall_add matrix ${MATRIX_PORT}

+ 5
- 2
src/freedombone-utils-turn Прегледај датотеку

38
     echo "use-auth-secret" >> "${filepath}"
38
     echo "use-auth-secret" >> "${filepath}"
39
     echo "static-auth-secret=${turnkey}" >> "${filepath}"
39
     echo "static-auth-secret=${turnkey}" >> "${filepath}"
40
     echo "realm=turn.${DEFAULT_DOMAIN_NAME}" >> "${filepath}"
40
     echo "realm=turn.${DEFAULT_DOMAIN_NAME}" >> "${filepath}"
41
-    echo "cert=$MATRIX_DATA_DIR/${DEFAULT_DOMAIN_NAME}.tls.crt" >> "${filepath}"
42
-    echo "pkey=$MATRIX_DATA_DIR/${DEFAULT_DOMAIN_NAME}.tls.key" >> "${filepath}"
41
+    if [[ $ONION_ONLY == 'no' ]]; then
42
+        echo "cert=$MATRIX_DATA_DIR/${DEFAULT_DOMAIN_NAME}.tls.crt" >> "${filepath}"
43
+        echo "pkey=$MATRIX_DATA_DIR/${DEFAULT_DOMAIN_NAME}.tls.key" >> "${filepath}"
44
+    fi
43
 }
45
 }
44
 
46
 
45
 function remove_turn {
47
 function remove_turn {
84
     turnkey="$(create_password 30)"
86
     turnkey="$(create_password 30)"
85
     generate_turn_key $turnkey /var/lib/turn/turnserver.conf
87
     generate_turn_key $turnkey /var/lib/turn/turnserver.conf
86
 
88
 
89
+    chmod -R 700 /var/lib/turn/turnserver.conf
87
     chown -R matrix:matrix /var/lib/turn
90
     chown -R matrix:matrix /var/lib/turn
88
 
91
 
89
     echo '[Unit]' > /etc/systemd/system/turn.service
92
     echo '[Unit]' > /etc/systemd/system/turn.service