Commit Graph

333 Commits

Author SHA1 Message Date
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
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
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
f46758fe53
fix firewalld not updating interfaces
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
2024-06-19 17:31:23 +05:30
b7ffc08af9 Merge pull request 'enroll derigsm01' (#94) from add_derigsm01 into production
Some checks failed
ci/lysergic/push/pipeline Pipeline failed
Reviewed-on: #94
2024-01-25 18:47:07 +01:00
6d931c54cb
enroll derigsm01
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
2024-01-09 02:33:03 +05:30
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
931403de64 Merge branch 'production' into chillcord 2023-10-04 13:42:01 +02:00
f26bace747
attempt disc-chilldevirc connect
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-10-04 17:10:16 +05:30
3c1cb027ba Merge pull request 'Remove chillops bridge gateway' (#92) from bridgeupdates into production
Reviewed-on: #92
2023-10-03 15:12:27 +02:00
95edd4bcb4
remove chillops gateway matterb
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-10-03 18:38:43 +05:30
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
Reviewed-on: #90
2023-08-20 08:41:24 +02:00
b2aa0317e5
link keytomb irclc<->tg
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-08-20 11:49:09 +05:30
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
Reviewed-on: #89
2023-08-19 05:48:17 +02:00
0e3300bb49
attempt at fixing the irc-tg link
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-08-19 09:05:18 +05:30
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
Reviewed-on: #88
2023-08-18 22:48:48 +02:00
f0a2afc714
add petals irccasa<->tg
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-08-15 01:45:22 +05:30
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
Reviewed-on: #87
Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-08-10 01:26:19 +02:00
e91ce0f58f
fix syntax error in pull 86
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-08-10 04:52:52 +05:30
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
Reviewed-on: #86
Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-08-10 01:06:54 +02:00
90abdc179b
bridge ircdevchan tgdevchan
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-08-10 04:08:34 +05:30
4df811c834 Merge pull request 'denc-webcluster: include proxy in agola' (#85) from fix/nginx/sslproxy into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #85
2023-07-31 21:29:10 +02:00
32a0f8d653
denc-webcluster: include proxy in agola
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-07-31 21:25:28 +02:00
0df71b4331 Merge pull request 'Repair boolean' (#84) from fix/nginx/boolean into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #84
Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-07-31 21:15:42 +02:00
13d5e44baa
Repair boolean
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Follow up to b6e9f75352, forgot to quote
the string causing it to still be converted to a boolean.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-07-31 21:10:35 +02:00
beec7cde28 Merge pull request 'denc-webcluster: exclude 949110' (#83) from fix/bookstack/400 into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #83
2023-07-31 20:49:31 +02:00
fb981646e5
denc-webcluster: exclude 949110
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
ModSecurity rule blocked Bookstack from saving some pages while editing.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-07-31 20:44:52 +02:00
5d4350aed3 Merge pull request 'Repair boolean' (#82) from ci into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #82
2023-07-21 17:08:41 +02:00
b6e9f75352
Repair boolean
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
```
nginx: [emerg] invalid value "True" in "proxy_ssl_verify" directive, it
must be "on" or "off" in /etc/nginx/vhosts.d/agola.conf:14
```

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-07-21 17:04:49 +02:00
40b7913d32 Merge pull request 'Add reverse proxy for Agola' (#81) from ci into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #81
2023-07-21 16:37:16 +02:00
24d6de3a5d
Add reverse proxy for Agola
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
New service behind ci.lysergic.dev / ci.git.com.de.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-07-21 16:27:50 +02:00
8b735d45e2 Merge pull request 'Initialize OpenBSD support' (#80) from OpenBSD into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #80
Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-07-16 20:13:41 +02:00
e03e939bf9 Merge pull request 'Optimize minion' (#79) from minion-optimization into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #79
Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-07-16 20:12:36 +02:00
4778c43503
Initialize OpenBSD support
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
No states assigned yet.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-07-16 20:10:26 +02:00
dc3cbea053
Optimize minion
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Cache jobs for later reference, disable unused hardware grains.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-07-16 20:04:26 +02:00
c7e590843f Merge pull request 'Add http(s) to thetrip public zone' (#78) from thetrip-firewall into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #78
Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-07-01 22:25:51 +02:00
29ceb78cde
Add http(s) to thetrip public zone
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Forgotten in fffbaf4698.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-07-01 22:21:39 +02:00
fffbaf4698 Merge pull request 'Manage firewall on thetrip' (#77) from thetrip-firewall into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #77
Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-07-01 22:15:30 +02:00
8519dfec68
Manage firewall on thetrip
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-07-01 22:12:14 +02:00
b73c0805cd Merge pull request 'Manage firewall on derutil01' (#76) from derutil01-fw into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #76
Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-06-28 22:17:07 +02:00
080002e642
Manage firewall on derutil01
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Configuration should be imported already.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-06-28 22:10:58 +02:00
1bd2f39312 Merge pull request 'Change redis to redis7' (#75) from salt-redis7 into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #75
Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-06-28 22:00:16 +02:00
58c100acc1
Change redis to redis7
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Leap 15.5 renamed the package, "redis" will try to install Redis 6 and
cause a conflict.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-06-28 21:56:54 +02:00
47a364290c Merge pull request 'Remove backslashes in string' (#74) from fix-matterb-mediapath into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #74
Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-06-28 19:53:24 +02:00
b36dc960c8 Merge branch 'production' into fix-matterb-mediapath
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
2023-06-28 19:45:43 +02:00
ddf1c03dbb
remove backslash
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-06-28 23:10:34 +05:30
f4f7f93583 Merge pull request 'Update mediapath for matterbridge' (#73) from fix-matterb-mediapath into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #73
Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-06-27 20:27:16 +02:00
7145ae4481
update mediapath for matterbridge
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-06-27 23:47:53 +05:30
937b3c99b7 Merge pull request 'Add chillnet matterbridge uploads' (#72) from upload-matterbridge-chillnet into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #72
Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-06-24 22:27:51 +02:00
667646a295 Add chillnet matterbridge uploads
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
2023-06-25 01:46:13 +05:30