heroes / salt

Clone
Source Code
GIT

136578 Merge branch 'hellcp/matrix-update-bridges' into 'production'

Merged and Committed by Christian Boltz 3 years ago
raw patch tree
78aa2147c98a7b014c36c3fabef71834e68a5c6d c8239d3fbd657e47bccb69afb7ac108d625669f1
12 files changed. 149 lines added. 70 lines removed.
pillar/role/matrix.sls
file modified
+27 -0
salt/profile/matrix/config.sls
file modified
+10 -11
salt/profile/matrix/files/appservice-discord.yaml
file modified
+3 -2
salt/profile/matrix/files/appservice-irc.yaml
file modified
+1 -0
salt/profile/matrix/files/appservice-telegram.yaml
file modified
+3 -3
salt/profile/matrix/files/appservice-webhook.yaml
file modified
+2 -1
salt/profile/matrix/files/config-irc.yaml
file modified
+7 -4
salt/profile/matrix/files/config-riot.json
file modified
+1 -1
salt/profile/matrix/files/config-telegram.yaml
file modified
+2 -2
salt/profile/matrix/files/homeserver.yaml
file modified
+91 -3
salt/profile/matrix/files/log_config
file removed
-43
salt/profile/matrix/files/matrix-synapse.apparmor
file modified
+2 -0 
    Merge branch 'hellcp/matrix-update-bridges' into 'production'
    
    Update the bridges
    
    See merge request infra/salt!409
file modified
+27 -0
file modified
+10 -11
file modified
+3 -2
file modified
+1 -0
file modified
+3 -3
file modified
+2 -1
file modified
+7 -4
file modified
+1 -1
file modified
+2 -2
file modified
+91 -3
file removed
-43
file modified
+2 -0
Powered by Pagure 5.13.3
Documentation • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.