kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

bundles/matrix-synapse: deploy override.conf to make sure synapse doesn't try to load config from there
All checks were successful
bundlewrap/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Franzi 2020-09-05 20:06:35 +02:00
parent 6a12b564ac
commit 1744596296
Signed by: kunsi
GPG key ID: 12E3D2136B818350
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bundles/matrix-synapse/files/override.conf Normal file
View file

@ -0,0 +1,6 @@
[Service]
ExecStartPre=
ExecStartPre=/opt/venvs/matrix-synapse/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml --generate-keys
ExecStart=
ExecStart=/opt/venvs/matrix-synapse/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml

14
bundles/matrix-synapse/items.py
View file

@ -9,11 +9,23 @@ files = {
'svc_systemd:matrix-synapse:restart', 'svc_systemd:matrix-synapse:restart',
}, },
}, },
'/etc/systemd/system/matrix-synapse.service.d/override.conf': {
'needs': {
'pkg_apt:matrix-synapse-py3',
},
'triggers': {
'action:systemd-reload',
'svc_systemd:matrix-synapse:restart',
},
},
'/etc/matrix-synapse/homeserver.signing.key': { '/etc/matrix-synapse/homeserver.signing.key': {
'content': repo.vault.decrypt_file('matrix-synapse/{}/homeserver_signing.key.vault'.format(node.name)), 'content': repo.vault.decrypt_file('matrix-synapse/{}/homeserver_signing.key.vault'.format(node.name)),
}, },
'/etc/matrix-synapse/conf.d': { '/etc/matrix-synapse/conf.d': {
'delete': True, 'delete': True,
'needs': {
'file:/etc/systemd/system/matrix-synapse.service.d/override.conf',
},
}, },
} }
@ -21,7 +33,7 @@ svc_systemd = {
'matrix-synapse': { 'matrix-synapse': {
'needs': { 'needs': {
'file:/etc/matrix-synapse/homeserver.yaml', 'file:/etc/matrix-synapse/homeserver.yaml',
'file:/etc/matrix-synapse/conf.d', 'file:/etc/systemd/system/matrix-synapse.service.d/override.conf',
'pkg_apt:matrix-synapse-py3', 'pkg_apt:matrix-synapse-py3',
}, },
}, },