Merge pull request 'cleanup interprotocol bridges' (#96) from cfg_matterbridge into production

Reviewed-on: #96
Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

pillar/global/init.sls

@@ -15,6 +15,7 @@ zypper:
   refreshdb_force: False
 
 firewalld:
+  FlushAllOnReload: 'yes'
   zones:
     internal:
       short: Internal

pillar/id/dericom02_rigel_lysergic_dev.sls

@@ -34,12 +34,12 @@ profile:
             Password: ${'secret_matterbridge:general:accounts:xmpp.libertacasa:Password'}
             Muc: muc.liberta.casa
             Nick: viaduct
-            RemoteNickFormat: '[{PROTOCOL}] <{NICK}>'
+            RemoteNickFormat: '[{PROTOCOL}] <{NICK}> '
             Label: x
             Debug: 'false'
           telegram.libertacasa:
             Token: ${'secret_matterbridge:general:accounts:telegram.libertacasa:Token'}
-            RemoteNickFormat: '&lt;{NICK}&gt; '
+            RemoteNickFormat: '[{PROTOCOL}] &lt;{NICK}&gt; '
             MessageFormat: HTMLNick
             Label: tg
             DisableWebPagePreview: 'true'
@@ -47,7 +47,7 @@ profile:
             Server: 192.168.0.110:2220
             Nick: LC
             RemoteNickFormat: '{PROTOCOL}:<{NICK}> '
-            Label: p
+            Label: ssh
           discord.23:
             Token: ${'secret_matterbridge:general:accounts:discord.23:Token'}
             Server: ${'secret_matterbridge:general:accounts:discord.23:Server'}
@@ -61,7 +61,6 @@ profile:
         gateways:
           libcasa:
             irc.libertacasa: '#libcasa'
-            sshchat.Psyched: sshchat
             xmpp.libertacasa: libcasa
           dev:
             irc.libertacasa: '#dev'
@@ -70,22 +69,18 @@ profile:
             irc.libertacasa: '#lucy'
             xmpp.libertacasa: lucy
             telegram.libertacasa: '-1001795702961'
+            sshchat.Psyched: sshchat
           info:
             irc.libertacasa: '#libcasa.info'
             xmpp.libertacasa: libcasa.info
-            #telegram.libertacasa: '-1001518274267'
           chat:
-            irc.libertacasa: '#chai'
+            irc.libertacasa: '#chat'
             discord.23: chat
             xmpp.libertacasa: chat
-          dota:
-            irc.libertacasa: '#dotes'
-            discord.23: dotes
-            xmpp.libertacasa: dota
-          aithunder:
-            irc.libertacasa: '#aithunder'
-          #  discord.aithunder: main-chat
-            xmpp.libertacasa: aithunder
+          petals:
+            irc.libertacasa: '#Petals'
+            telegram.libertacasa: '-1001971550949'
+
 
       libertacasa-irc:
         general:
@@ -216,15 +211,10 @@ profile:
           nerds:
             irc.libertacasa: '#nerds'
             irc.nerds: '#nerds'
-          chillops:
-            irc.libertacasa: '#chillops'
-            irc.chillnet: '#chillops'
-            irc.stardust: '#chillnet-test'
           music:
             irc.libertacasa: '#music'
             irc.chillnet: '#music'
             irc.stardust: '#music'
-
       chillnet:
         general:
           MediaDownloadSize: 1000000000
@@ -250,13 +240,18 @@ profile:
             MessageFormat: HTMLNick
             Label: tg
             DisableWebPagePreview: 'true'
+          discord.23:
+            Token: ${'secret_matterbridge:general:accounts:discord.23:Token'}
+            Server: ${'secret_matterbridge:general:accounts:discord.23:Server'}
+            {{ discord_common() }}
         gateways:
           staff:
             irc.chillnet: '#chillstaff'
             telegram.chillnet: '-1001932699309'
           devs:
             irc.chillnet: '#chilldevs'
-            telegram.chillnet: '-1001778806358
+            telegram.chillnet: '-1001778806358'
+            discord.23: chilldevs
 
   lighttpd:
     vhosts:

pillar/id/derigsm01_rigel_lysergic_dev.sls

@@ -0,0 +1 @@
+manage_firewall: True