소스 검색

use domain instead of matrix.domain for matrix IDs using well-known

Thomas Buck 5 년 전
부모
커밋
fd9c5625e9

+ 10
- 0
roles/matrix/tasks/synapse.yml 파일 보기

@@ -84,6 +84,16 @@
84 84
 - name: Start new Synapse instance
85 85
   service: name=matrix-synapse state=started
86 86
 
87
+- name: Create matrix well-known directory
88
+  file: state=directory path=/var/www/well-known/matrix owner=www-data group=www-data
89
+
90
+- name: Add redirect to well-known
91
+  template:
92
+    src=var_www_well-known_matrix_server.j2
93
+    dest=/var/www/well-known/matrix/server
94
+    owner=www-data
95
+    group=www-data
96
+
87 97
 - name: Create the Apache Matrix sites config files
88 98
   template:
89 99
     src=etc_apache2_sites-available_matrix.j2

+ 1
- 1
roles/matrix/templates/etc_matrix-synapse_conf.d_server_name.j2 파일 보기

@@ -6,4 +6,4 @@
6 6
 # e.g. matrix.org, localhost:8080, etc.
7 7
 # This is also the last part of your UserID.
8 8
 #
9
-server_name: "{{ matrix_domain }}"
9
+server_name: "{{ domain }}"

+ 2
- 2
roles/matrix/templates/etc_matrix-synapse_homeserver.j2 파일 보기

@@ -162,7 +162,7 @@ listeners:
162 162
       - '::'
163 163
     
164 164
     resources:
165
-      - names: [client, federation]
165
+      - names: [client, federation, webclient]
166 166
 
167 167
   # Unsecure HTTP listener: for when matrix traffic passes through a reverse proxy
168 168
   # that unwraps TLS.
@@ -177,7 +177,7 @@ listeners:
177 177
     x_forwarded: true
178 178
 
179 179
     resources:
180
-      - names: [client, federation]
180
+      - names: [client, federation, webclient]
181 181
         compress: false
182 182
 
183 183
     # example additonal_resources:

+ 1
- 1
roles/matrix/templates/root_riot_config.j2 파일 보기

@@ -1,5 +1,5 @@
1 1
 {
2
-    "default_hs_url": "https://{{ matrix_domain }}",
2
+    "default_hs_url": "https://{{ domain }}",
3 3
     "default_is_url": "https://matrix.org",
4 4
     "disable_custom_urls": false,
5 5
     "disable_guests": false,

+ 3
- 0
roles/matrix/templates/var_www_well-known_matrix_server.j2 파일 보기

@@ -0,0 +1,3 @@
1
+{
2
+    "m.server": "{{ matrix_domain }}:8448"
3
+}

Loading…
취소
저장