LibertaCasa/salt
LibertaCasa/salt
9
1
Fork 0
Code Issues 5 Pull Requests Releases Activity

Compare commits

merge into: LibertaCasa:fix/matterb-trashtgirclinks
Branches Tags
LibertaCasa:production
LibertaCasa:fix/matterb-trashtgirclinks
LibertaCasa:add/matterbridge-chillnet-tgchan
LibertaCasa:mta-optional
LibertaCasa:orpheus
LibertaCasa:privatebin
LibertaCasa:bookstack
LibertaCasa:nsd
LibertaCasa:import-denc-webcluster
LibertaCasa:fix/pillar_boolquotes
...
pull from: LibertaCasa:production
Branches Tags
LibertaCasa:production
LibertaCasa:fix/matterb-trashtgirclinks
LibertaCasa:add/matterbridge-chillnet-tgchan
LibertaCasa:mta-optional
LibertaCasa:orpheus
LibertaCasa:privatebin
LibertaCasa:bookstack
LibertaCasa:nsd
LibertaCasa:import-denc-webcluster
LibertaCasa:fix/pillar_boolquotes

11 Commits
fix/matter ... production

Author SHA1 Message Date
Pratyush Desai
8231c71927 Merge pull request 'cleanup interprotocol bridges' (#96) from cfg_matterbridge into production 
Reviewed-on: #96
Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2024-09-07 22:07:22 +02:00
Pratyush Desai
00e7832e9d
cleanup interprotocol bridges 
Updating sshchat label
Remote nick formatting fixes

Remove some redundant linkages:

Remove commented out tg for #libcasa.info as it is not being utilised
Remove stale dota related bridge
Removed keytomb stuff as it is stale and didn't work anyway.

Reroute bridges:

Rerouting sshchat from #libcasa to #lucy as there isn't much conversation on #libcasa atm. So if it will be getting used, it's likely only to communicate on #lucy.

Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
 2024-09-01 22:25:18 +05:30
Georg Pfuetzenreuter
47c7b56e86 Merge pull request 'fix firewalld not updating interfaces during reload' (#95) from fw_flushreload into production 
Reviewed-on: #95
 2024-06-19 19:45:21 +02:00
Pratyush Desai
f46758fe53
fix firewalld not updating interfaces 
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
 2024-06-19 17:31:23 +05:30
Georg Pfuetzenreuter
b7ffc08af9 Merge pull request 'enroll derigsm01' (#94) from add_derigsm01 into production
Some checks failed
ci/lysergic/push/pipeline Pipeline failed
Details 
Reviewed-on: #94
 2024-01-25 18:47:07 +01:00
Pratyush Desai
6d931c54cb
enroll derigsm01 
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
 2024-01-09 02:33:03 +05:30
Pratyush Desai
46f5fd365c Merge pull request 'attempt disc-chilldevirc connect' (#93) from chillcord into production 
Reviewed-on: #93
Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-10-04 14:03:01 +02:00
Pratyush Desai
931403de64 Merge branch 'production' into chillcord 2023-10-04 13:42:01 +02:00
Pratyush Desai
f26bace747
attempt disc-chilldevirc connect 
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
 2023-10-04 17:10:16 +05:30
Pratyush Desai
3c1cb027ba Merge pull request 'Remove chillops bridge gateway' (#92) from bridgeupdates into production 
Reviewed-on: #92
 2023-10-03 15:12:27 +02:00
Pratyush Desai
95edd4bcb4
remove chillops gateway matterb 
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
 2023-10-03 18:38:43 +05:30
3 changed files with 12 additions and 18 deletions
Show Stats Expand all files Collapse all files

1
pillar/global/init.sls
View File

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

26
pillar/id/dericom02_rigel_lysergic_dev.sls
View File

@ -39,7 +39,7 @@ profile:
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,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:
@ -219,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
@ -253,6 +240,10 @@ 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'
@ -260,6 +251,7 @@ profile:
devs:
irc.chillnet: '#chilldevs'
telegram.chillnet: '-1001778806358'
discord.23: chilldevs
lighttpd:
vhosts:

1
pillar/id/derigsm01_rigel_lysergic_dev.sls Normal file
View File

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