Bob Mottram 8 gadus atpakaļ
vecāks
revīzija
e87f4286bb
1 mainītis faili ar 6 papildinājumiem un 2 dzēšanām
  1. 6
    2
      src/freedombone-app-matrix

+ 6
- 2
src/freedombone-app-matrix Parādīt failu

11
 # matrix server
11
 # matrix server
12
 #
12
 #
13
 # https://raw.githubusercontent.com/silvio/docker-matrix
13
 # https://raw.githubusercontent.com/silvio/docker-matrix
14
+# https://matrix.org/blog/2016/02/10/advanced-synapse-setup-with-lets-encrypt
15
+#
16
+# Test by visiting https://$MATRIX_DOMAIN_NAME/_matrix/key/v2/server/auto
14
 #
17
 #
15
 # License
18
 # License
16
 # =======
19
 # =======
48
 MATRIX_ONION_PORT=8109
51
 MATRIX_ONION_PORT=8109
49
 MATRIX_ID_ONION_PORT=8111
52
 MATRIX_ID_ONION_PORT=8111
50
 MATRIX_REPO="https://github.com/matrix-org/synapse"
53
 MATRIX_REPO="https://github.com/matrix-org/synapse"
51
-MATRIX_COMMIT='27c005ae2c568909ab98fa936f38c0952bffe679'
54
+MATRIX_COMMIT='c45dc6c62aa2a2e83a10d8116a709dfd8c144e3c'
52
 SYDENT_REPO="https://github.com/matrix-org/sydent"
55
 SYDENT_REPO="https://github.com/matrix-org/sydent"
53
 SYDENT_COMMIT='d087278afd712222653b69ff72bd8ff4aa0180ec'
56
 SYDENT_COMMIT='d087278afd712222653b69ff72bd8ff4aa0180ec'
54
 REPORT_STATS="no"
57
 REPORT_STATS="no"
704
     echo 'Type=simple' >> /etc/systemd/system/matrix.service
707
     echo 'Type=simple' >> /etc/systemd/system/matrix.service
705
     echo 'User=matrix' >> /etc/systemd/system/matrix.service
708
     echo 'User=matrix' >> /etc/systemd/system/matrix.service
706
     echo "WorkingDirectory=/etc/matrix" >> /etc/systemd/system/matrix.service
709
     echo "WorkingDirectory=/etc/matrix" >> /etc/systemd/system/matrix.service
710
+    echo "ExecStartPre=/usr/bin/python -m synapse.app.homeserver --config-path ${MATRIX_DATA_DIR}/homeserver.yaml --generate-keys" >> /etc/systemd/system/matrix.service
707
     echo "ExecStart=/usr/bin/python -m synapse.app.homeserver --config-path ${MATRIX_DATA_DIR}/homeserver.yaml" >> /etc/systemd/system/matrix.service
711
     echo "ExecStart=/usr/bin/python -m synapse.app.homeserver --config-path ${MATRIX_DATA_DIR}/homeserver.yaml" >> /etc/systemd/system/matrix.service
708
-    echo 'Restart=always' >> /etc/systemd/system/matrix.service
712
+    echo 'Restart=on-failure' >> /etc/systemd/system/matrix.service
709
     echo 'RestartSec=10' >> /etc/systemd/system/matrix.service
713
     echo 'RestartSec=10' >> /etc/systemd/system/matrix.service
710
     echo '' >> /etc/systemd/system/matrix.service
714
     echo '' >> /etc/systemd/system/matrix.service
711
     echo '[Install]' >> /etc/systemd/system/matrix.service
715
     echo '[Install]' >> /etc/systemd/system/matrix.service