Merge pull request 'Use consistent quotes' (#98 ) from fix/quote_nit into production

Reviewed-on: #98 Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Use consistent quotes
2025-04-24 15:46:20 +02:00 · 2025-04-24 19:10:55 +05:30 · 2025-04-23 22:14:51 +02:00 · 2025-04-23 12:21:37 +05:30 · 2025-04-23 12:17:12 +05:30 · 2024-09-07 22:07:22 +02:00
3 changed files with 22 additions and 20 deletions
--- a/pillar/global/init.sls
+++ b/pillar/global/init.sls
@ -15,6 +15,7 @@ zypper:
  refreshdb_force: False

 firewalld:
+  FlushAllOnReload: 'yes'
  zones:
    internal:
      short: Internal
--- 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: '&lt;{NICK}&gt; '
+            RemoteNickFormat: '[{PROTOCOL}] &lt;{NICK}&gt; '
            MessageFormat: HTMLNick
            Label: tg
            DisableWebPagePreview: 'true'
@ -47,10 +47,11 @@ 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'}
+            RemoteNickFormat: '[{PROTOCOL}] <{NICK}> '
            {{ discord_common() }}
          {#-
          discord.aithunder:
@ -61,8 +62,11 @@ profile:
        gateways:
          libcasa:
            irc.libertacasa: '#libcasa'
-            sshchat.Psyched: sshchat
            xmpp.libertacasa: libcasa
+          music:
+            irc.libertacasa: '#music'
+            xmpp.libertacasa: 'music'
+            discord.23: 'music'
          dev:
            irc.libertacasa: '#dev'
            xmpp.libertacasa: dev
@ -70,22 +74,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 +216,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 +245,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:
--- a/pillar/id/derigsm01_rigel_lysergic_dev.sls
+++ b/pillar/id/derigsm01_rigel_lysergic_dev.sls
@ -0,0 +1 @@
+manage_firewall: True
Author	SHA1	Message	Date
Georg Pfuetzenreuter	0bf07dc5e2	Merge pull request 'Use consistent quotes' (#98 ) from fix/quote_nit into production Reviewed-on: #98 Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2025-04-24 15:46:20 +02:00
Pratyush Desai	bf0b600b42	Use consistent quotes switched to single quotes Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>	2025-04-24 19:10:55 +05:30
Pratyush Desai	63fc173060	Merge pull request 'Join the music rooms a bit' (#97 ) from add_discord_rooms into production Reviewed-on: #97 Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2025-04-23 22:14:51 +02:00
Pratyush Desai	2e98d8085f	Fix missing RemoteNickFormat maybe something cool could be done to show users less dry on the other side of irc. Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>	2025-04-23 12:21:37 +05:30
Pratyush Desai	a5e1080e75	Join the music rooms a bit Added discord.23 music and xmpp music into the mix. hopefully snoringhastly will not be annoyed about it. ;) Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>	2025-04-23 12:17:12 +05:30
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
Pratyush Desai	b454b5f5b9	Merge pull request 'link keytomb irclc<->tg' (#90 ) from matterb-tg-irc-keytomb into production All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Reviewed-on: #90	2023-08-20 08:41:24 +02:00
Pratyush Desai	b2aa0317e5	link keytomb irclc<->tg All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>	2023-08-20 11:49:09 +05:30
Pratyush Desai	10e380c3c1	Merge pull request 'attempt at fixing the irc-tg link' (#89 ) from add/matterb-lcirc-tgpetals into production All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Reviewed-on: #89	2023-08-19 05:48:17 +02:00
Pratyush Desai	0e3300bb49	attempt at fixing the irc-tg link All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>	2023-08-19 09:05:18 +05:30
Pratyush Desai	fd68a06188	Merge pull request 'add petals irccasa<->tg' (#88 ) from add/matterb-lcirc-tg-petals into production All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Reviewed-on: #88	2023-08-18 22:48:48 +02:00
Pratyush Desai	f0a2afc714	add petals irccasa<->tg All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>	2023-08-15 01:45:22 +05:30
Pratyush Desai	14109af928	Merge pull request 'fix syntax error in pull 86' (#87 ) from fix/matterb-chillnet-tgchanaddop into production All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Reviewed-on: #87 Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-08-10 01:26:19 +02:00
Pratyush Desai	e91ce0f58f	fix syntax error in pull 86 All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>	2023-08-10 04:52:52 +05:30
Pratyush Desai	e8a5ec5594	Merge pull request 'bridge ircdevchan tgdevchan' (#86 ) from add/matterbridge-chillnet-tgchan into production All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Reviewed-on: #86 Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-08-10 01:06:54 +02:00