瀏覽代碼

Re-enable matrix homeserver

Bob Mottram 8 年之前
父節點
當前提交
e7b1951c53
共有 1 個文件被更改,包括 5 次插入5 次删除
  1. 5
    5
      src/freedombone-app-matrix

+ 5
- 5
src/freedombone-app-matrix 查看文件

@@ -30,10 +30,10 @@
30 30
 # You should have received a copy of the GNU Affero General Public License
31 31
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
32 32
 
33
-VARIANTS=''
33
+VARIANTS='full full-vim chat'
34 34
 
35 35
 IN_DEFAULT_INSTALL=0
36
-SHOW_ON_ABOUT=0
36
+SHOW_ON_ABOUT=1
37 37
 
38 38
 MATRIX_DATA_DIR='/var/lib/matrix'
39 39
 MATRIX_HTTP_PORT=8558
@@ -43,9 +43,9 @@ MATRIX_ID_PORT=8081
43 43
 MATRIX_ONION_PORT=8109
44 44
 MATRIX_ID_ONION_PORT=8111
45 45
 MATRIX_REPO="https://github.com/matrix-org/synapse"
46
-MATRIX_COMMIT='f5a4001bb116c468cc5e8e0ae04a1c570e2cb171'
46
+MATRIX_COMMIT='fad3a8433535d7de321350bbd17373138c6fd3ec'
47 47
 SYDENT_REPO="https://github.com/matrix-org/sydent"
48
-SYDENT_COMMIT='99edbd4c80c42b76e26f696054fcbbceecb25d5f'
48
+SYDENT_COMMIT='81231b93e2e987445ad232b0a8216de33c1eba6d'
49 49
 REPORT_STATS="no"
50 50
 MATRIX_SECRET=
51 51
 
@@ -333,7 +333,7 @@ function upgrade_matrix {
333 333
     cd /etc/sydent
334 334
     pip install --upgrade --process-dependency-links .
335 335
 
336
-    sed -i 's/ssl.PROTOCOL_SSLv23/ssl.PROTOCOL_TLSv1/g' /usr/local/bin/register_new_matrix_user
336
+    #sed -i 's/ssl.PROTOCOL_SSLv23/ssl.PROTOCOL_TLSv1/g' /usr/local/bin/register_new_matrix_user
337 337
 
338 338
     chown -R matrix:matrix /etc/matrix
339 339
     chown -R matrix:matrix /etc/sydent