heroes / salt

Clone
Source Code
GIT

9016b6 Merge branch 'hellcp/matrix-fixes' into 'production'

Merged and Committed by Sasi Olin 2 years ago
raw patch tree
ed192810f4dc557312fa9ee0251beddafc397aad 136178de75ac2de8b352a167cd70d1d5c1f8fe4f
14 files changed. 363 lines added. 169 lines removed.
pillar/role/matrix.sls
file modified
+5 -5
pillar/secrets/role/matrix.sls
file modified
+130 -0
salt/profile/matrix/appservice.sls
file modified
+7 -12
salt/profile/matrix/dimension.sls
file modified
+0 -7
salt/profile/matrix/files/appservice-webhook.yaml
file modified
+1 -1
salt/profile/matrix/files/appservice.service
file modified
+0 -1
salt/profile/matrix/files/config-telegram.yaml
file modified
+41 -46
salt/profile/matrix/files/config-webhook.yaml
file modified
+167 -36
salt/profile/matrix/files/dimension.service
file modified
+0 -1
salt/profile/matrix/files/telegram.service
file removed
-15
salt/profile/matrix/files/worker.yaml
file modified
+3 -1
salt/profile/matrix/files/workers.nginx
file modified
+2 -0
salt/profile/matrix/synapse.sls
file modified
+3 -3
salt/profile/matrix/telegram.sls
file modified
+4 -41 
    Merge branch 'hellcp/matrix-fixes' into 'production'
    
    Small fixes to matrix formula and config
    
    See merge request infra/salt!557
file modified
+5 -5
file modified
+130 -0
file modified
+7 -12
file modified
+0 -7
file modified
+1 -1
file modified
+0 -1
file modified
+41 -46
file modified
+167 -36
file modified
+0 -1
file removed
-15
file modified
+3 -1
file modified
+2 -0
file modified
+3 -3
file modified
+4 -41
Powered by Pagure 5.13.3
Documentation • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.