Procházet zdrojové kódy

Run matrix federation also over apache to get proper TLS. For some reason not working with tls from synapse itself.

Thomas Buck před 5 roky
rodič
revize
85e7c343c5

+ 0
- 6
roles/matrix/tasks/synapse.yml Zobrazit soubor

72
 - name: Add cert postrenew task
72
 - name: Add cert postrenew task
73
   copy: src=etc_letsencrypt_postrenew_synapse.sh dest=/etc/letsencrypt/postrenew/synapse.sh mode=0755
73
   copy: src=etc_letsencrypt_postrenew_synapse.sh dest=/etc/letsencrypt/postrenew/synapse.sh mode=0755
74
 
74
 
75
-- name: Set firewall rules for Synapse
76
-  ufw: rule=allow port={{ item }} proto=tcp
77
-  with_items:
78
-    - 8448  # matrix federation
79
-  tags: ufw
80
-
81
 - name: Register new Synapse service
75
 - name: Register new Synapse service
82
   systemd: name=matrix-synapse daemon_reload=yes enabled=yes
76
   systemd: name=matrix-synapse daemon_reload=yes enabled=yes
83
 
77
 

+ 8
- 8
roles/matrix/templates/etc_matrix-synapse_homeserver.j2 Zobrazit soubor

155
   # will also need to give Synapse a TLS key and certificate: see the TLS section
155
   # will also need to give Synapse a TLS key and certificate: see the TLS section
156
   # below.)
156
   # below.)
157
   #
157
   #
158
-  - port: 8448
159
-    type: http
160
-    tls: true
161
-    bind_addresses:
162
-      - '::'
163
-    
164
-    resources:
165
-      - names: [client, federation, webclient]
158
+  #- port: 8448
159
+  #  type: http
160
+  #  tls: true
161
+  #  bind_addresses:
162
+  #    - '::'
163
+  #
164
+  #  resources:
165
+  #    - names: [client, federation, webclient]
166
 
166
 
167
   # Unsecure HTTP listener: for when matrix traffic passes through a reverse proxy
167
   # Unsecure HTTP listener: for when matrix traffic passes through a reverse proxy
168
   # that unwraps TLS.
168
   # that unwraps TLS.

+ 1
- 1
roles/matrix/templates/var_www_well-known_matrix_server.j2 Zobrazit soubor

1
 {
1
 {
2
-    "m.server": "{{ matrix_domain }}:8448"
2
+    "m.server": "{{ matrix_domain }}:443"
3
 }
3
 }

+ 1
- 1
roles/monitoring/files/etc_monit_conf.d_matrix Zobrazit soubor

2
   group social
2
   group social
3
   start program = "/bin/systemctl start matrix-synapse"
3
   start program = "/bin/systemctl start matrix-synapse"
4
   stop program = "/bin/systemctl stop matrix-synapse"
4
   stop program = "/bin/systemctl stop matrix-synapse"
5
-  if failed port 8448 type tcp
5
+  if failed port 8008 type tcp
6
     with timeout 10 seconds
6
     with timeout 10 seconds
7
     then restart
7
     then restart
8
   if 5 restarts within 5 cycles then timeout
8
   if 5 restarts within 5 cycles then timeout

Loading…
Zrušit
Uložit