heroes / salt

Clone
Source Code
GIT

6f52ee Merge branch 'hellcp/matrix-database' into 'production'

Merged and Committed by Christian Boltz a year ago
raw patch tree
6160dadd8ed7706b92cceaffc8a99831d92bab15 2b26eb83dba6f78e069b3d4397cde1b8872907e3
10 files changed. 292 lines added. 331 lines removed.
pillar/role/matrix.sls
file modified
+9 -8
pillar/secrets/role/matrix.sls
file modified
+246 -300
salt/profile/matrix/appservice.sls
file modified
+2 -2
salt/profile/matrix/config.sls
file modified
+14 -6
salt/profile/matrix/dimension.sls
file modified
+0 -2
salt/profile/matrix/files/appservice-hookshot.yamlsalt/profile/matrix/files/appservice-webhook.yaml
file renamed
+5 -6
salt/profile/matrix/files/config-element.jsonsalt/profile/matrix/files/config-riot.json
file renamed
+0 -0
salt/profile/matrix/files/config-hookshot.yamlsalt/profile/matrix/files/config-webhook.yaml
file renamed
+0 -0
salt/profile/matrix/files/upstreams.nginx
file added
+16
salt/profile/matrix/files/workers.nginx
file modified
+0 -7 
    Merge branch 'hellcp/matrix-database' into 'production'
    
    sync up with the matrix machine
    
    See merge request infra/salt!577
file modified
+9 -8
file modified
+246 -300
file modified
+2 -2
file modified
+14 -6
file modified
+0 -2
salt/profile/matrix/files/appservice-hookshot.yaml salt/profile/matrix/files/appservice-webhook.yaml
file renamed
+5 -6
salt/profile/matrix/files/config-element.json salt/profile/matrix/files/config-riot.json
file renamed
file was renamed with no change to the file
salt/profile/matrix/files/config-hookshot.yaml salt/profile/matrix/files/config-webhook.yaml
file renamed
file was renamed with no change to the file
file added
+16
file modified
+0 -7
Powered by Pagure 5.13.3
Documentation • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.