diff options
| author | Pratyush Desai | 2024-09-07 22:07:22 +0200 |
|---|---|---|
| committer | Pratyush Desai | 2024-09-07 22:07:22 +0200 |
| commit | 8231c71927ac37e40b0270988c9c8213c2edc1a7 (patch) | |
| tree | d6e123a613c6649ba7f253dee85a57068876bc40 /pillar | |
| parent | 47c7b56e8647ebe271546a6fcd30543f87097259 (diff) | |
| parent | 00e7832e9de9aaf2e4d9f57002edf4c72f8e2416 (diff) | |
| download | salt-production.tar.gz salt-production.tar.bz2 salt-production.zip | |
Merge pull request 'cleanup interprotocol bridges' (#96) from cfg_matterbridge into productionHEADproduction
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/96
Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Diffstat (limited to 'pillar')
| -rw-r--r-- | pillar/id/dericom02_rigel_lysergic_dev.sls | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/pillar/id/dericom02_rigel_lysergic_dev.sls b/pillar/id/dericom02_rigel_lysergic_dev.sls index 6334f42..8e9c2eb 100644 --- a/pillar/id/dericom02_rigel_lysergic_dev.sls +++ b/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: '<{NICK}> ' + RemoteNickFormat: '[{PROTOCOL}] <{NICK}> ' 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,24 +69,17 @@ 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 petals: irc.libertacasa: '#Petals' telegram.libertacasa: '-1001971550949' - keytomb: - irc.libertacasa: '#keytomb' - telegram.libertacasa: '-100883999270' libertacasa-irc: |