diff --git a/pillar/role/matrix.sls b/pillar/role/matrix.sls index d22acf6..165a546 100644 --- a/pillar/role/matrix.sls +++ b/pillar/role/matrix.sls @@ -6,7 +6,7 @@ include: profile: matrix: - database_host: 192.168.47.4 + database_host: 192.168.47.27 database_name: matrix database_user: matrix workers: @@ -101,9 +101,6 @@ profile: - workers: pusher1: 8551 pusher2: 8552 - appservice: - - workers: - appservice: 8561 federation_sender: - workers: federation_sender1: 8571 @@ -116,11 +113,6 @@ profile: media2: 8582 resources: - media - user_dir: - - rest: - - ^/_matrix/client/(api/v1|r0|v3|unstable)/user_directory/search$ - workers: - user_dir: 8591 frontend_proxy: - rest: - ^/_matrix/client/(api/v1|r0|v3|unstable)/keys/upload @@ -143,7 +135,7 @@ profile: branch: main appservice_id: f4de7550133374c703c4cd64c5898cf1b82b65d4a5c2aca93863ee1fb859df91 build: True - script: /usr/bin/node App/BridgeApp.js config.yaml webhook-registration.yaml + script: /usr/bin/node --require source-map-support/register lib/App/BridgeApp.js config.yaml webhook-registration.yaml telegram: appservice_id: oepzkscngbyqvopzn773ns7whfxyfslgjhy7mumy7syurqp3f4kvb4sgufz9nfsw api_id: 1331253 diff --git a/salt/profile/matrix/appservice.sls b/salt/profile/matrix/appservice.sls index 5f73f17..9a79553 100644 --- a/salt/profile/matrix/appservice.sls +++ b/salt/profile/matrix/appservice.sls @@ -11,6 +11,7 @@ appservice_pgks: - make - gcc - gcc-c++ + - cargo {% for dir, data in appservices.items() %} /var/lib/matrix-synapse/{{ dir }}: @@ -68,8 +69,6 @@ synapse_appservice_{{ dir }}_file: - name: npm install - cwd: /var/lib/matrix-synapse/{{ dir }} - runas: synapse - - env: - - NODE_VERSION: 12 {% if data.get('build') == True %} {{ dir }}_build: @@ -77,8 +76,6 @@ synapse_appservice_{{ dir }}_file: - name: npm run build - cwd: /var/lib/matrix-synapse/{{ dir }} - runas: synapse - - env: - - NODE_VERSION: 12 {% endif %} {{ dir }}_systemd_file: diff --git a/salt/profile/matrix/files/appservice.service b/salt/profile/matrix/files/appservice.service index 1eb75e5..7014252 100644 --- a/salt/profile/matrix/files/appservice.service +++ b/salt/profile/matrix/files/appservice.service @@ -9,8 +9,6 @@ RestartSec=3600 User=synapse Group=synapse WorkingDirectory=/var/lib/matrix-synapse/{{ dir }}/ -Environment="WEBHOOKS_USER_STORE_PATH=/data/matrix/webhook/user-store.db" -Environment="WEBHOOKS_ROOM_STORE_PATH=/data/matrix/webhook/room-store.db" Environment="NODE_ENV=production" ExecStart={{ script }} diff --git a/salt/profile/matrix/files/homeserver.yaml b/salt/profile/matrix/files/homeserver.yaml index e8a59e4..e36e552 100644 --- a/salt/profile/matrix/files/homeserver.yaml +++ b/salt/profile/matrix/files/homeserver.yaml @@ -236,6 +236,8 @@ listeners: # bind_addresses: ['::1', '127.0.0.1'] # type: manhole +send_federation: false +start_pushers: false worker_replication_secret: "{{ pillar['profile']['matrix']['worker_replication_secret'] }}"