295 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Georg Pfuetzenreuter	8519dfec68	Manage firewall on thetrip ... Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-07-01 22:12:14 +02:00
Georg Pfuetzenreuter	b73c0805cd	Merge pull request 'Manage firewall on derutil01' (#76) from derutil01-fw into production ... Reviewed-on: #76 Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>	2023-06-28 22:17:07 +02:00
Georg Pfuetzenreuter	080002e642	Manage firewall on derutil01 ... Configuration should be imported already. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-06-28 22:10:58 +02:00
Georg Pfuetzenreuter	1bd2f39312	Merge pull request 'Change redis to redis7' (#75) from salt-redis7 into production ... Reviewed-on: #75 Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>	2023-06-28 22:00:16 +02:00
Georg Pfuetzenreuter	58c100acc1	Change redis to redis7 ... 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
Pratyush Desai	47a364290c	Merge pull request 'Remove backslashes in string' (#74) from fix-matterb-mediapath into production ... Reviewed-on: #74 Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-06-28 19:53:24 +02:00
Pratyush Desai	b36dc960c8	Merge branch 'production' into fix-matterb-mediapath	2023-06-28 19:45:43 +02:00
Pratyush Desai	ddf1c03dbb	remove backslash ... Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>	2023-06-28 23:10:34 +05:30
Pratyush Desai	f4f7f93583	Merge pull request 'Update mediapath for matterbridge' (#73) from fix-matterb-mediapath into production ... Reviewed-on: #73 Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-06-27 20:27:16 +02:00
Pratyush Desai	7145ae4481	update mediapath for matterbridge ... Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>	2023-06-27 23:47:53 +05:30
Pratyush Desai	937b3c99b7	Merge pull request 'Add chillnet matterbridge uploads' (#72) from upload-matterbridge-chillnet into production ... Reviewed-on: #72 Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-06-24 22:27:51 +02:00
Pratyush Desai	667646a295	Add chillnet matterbridge uploads ... Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>	2023-06-25 01:46:13 +05:30
Pratyush Desai	36c70f4016	Merge pull request 'Rename Chillnet staff channel' (#71) from matter_remap into production ... Reviewed-on: #71 Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-03 20:51:09 +02:00
Pratyush Desai	97045b5f12	Used /RENAME for #fightclub	2023-05-03 19:38:05 +02:00
Georg Pfuetzenreuter	ffbd2dc4c3	Merge pull request 'Init psyched.dev' (#70) from psyched into production ... Reviewed-on: #70	2023-05-02 21:07:25 +02:00
Georg Pfuetzenreuter	c1fcf5f3b1	Init psyched.dev ... Add pillar IDs for theia/orpheus/selene to disable sshd management on them (machines use custom configurations for historic reasons, and we like to preserve history). Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-02 21:00:45 +02:00
Georg Pfuetzenreuter	ac0a2b6587	Merge pull request 'Init dencpod01.lysergic.dev' (#68) from dencpod01 into production ... Reviewed-on: #68	2023-05-02 20:51:55 +02:00
Georg Pfuetzenreuter	b6b129c41f	Init dencpod01.lysergic.dev ... Blank machine. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-02 20:40:09 +02:00
Georg Pfuetzenreuter	774706211e	Merge pull request 'Move backup_mode to minion dict' (#67) from file-backup into production ... Reviewed-on: #67	2023-05-02 20:28:34 +02:00
Georg Pfuetzenreuter	2ce85f172e	Move backup_mode to minion dict ... Is a minion specific option. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-02 20:25:33 +02:00
Georg Pfuetzenreuter	ffe1e60baf	Merge pull request 'Enable minion file backup' (#66) from file-backup into production ... Reviewed-on: #66	2023-05-02 20:19:46 +02:00
Georg Pfuetzenreuter	c4532b4686	Enable minion file backup ... https://docs.saltproject.io/en/latest/ref/states/backup_mode.html Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-02 20:13:24 +02:00
Georg Pfuetzenreuter	3143bfd96d	Merge pull request 'Import moni firewall configuration' (#65) from moni into production ... Reviewed-on: #65	2023-05-02 20:06:31 +02:00
Georg Pfuetzenreuter	d89138e2a7	Import moni firewall configuration ... Some ports not yet covered by a role. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-02 20:02:21 +02:00
Georg Pfuetzenreuter	05d86ce689	Merge pull request 'Init phoebe.lysergic.dev' (#64) from phoebe into production ... Reviewed-on: #64	2023-05-02 19:52:06 +02:00
Georg Pfuetzenreuter	55acb1dea4	Init phoebe.lysergic.dev ... Blank machine. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-02 19:48:22 +02:00
Georg Pfuetzenreuter	9f176609a5	Merge pull request 'Add manage_sshd conditional' (#63) from sshd-optional into production ... Reviewed-on: #63	2023-05-02 19:39:20 +02:00
Georg Pfuetzenreuter	409016ea75	Disable manage_sshd for philia ... Machine uses a custom sshd configuration for $reasons. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-02 19:32:36 +02:00
Georg Pfuetzenreuter	8776b16be1	Add manage_sshd conditional ... Allow sshd configuration to be skipped on "special" machines using an optional "manage_sshd: False" pillar option. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-02 19:30:33 +02:00
Georg Pfuetzenreuter	6763d1b64e	Merge pull request 'No longer remove libX11' (#62) from libX11 into production ... Reviewed-on: #62	2023-05-02 00:16:20 +02:00
Georg Pfuetzenreuter	d4d7d41ca7	No longer remove libX11 ... Multiple packages need it as a dependency, maintaining an exclusion list is not feasible. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-02 00:11:45 +02:00
Georg Pfuetzenreuter	16827d7318	Merge pull request 'Add users conditional for sss' (#61) from skip-users-if-sss into production ... Reviewed-on: #61	2023-05-01 23:15:45 +02:00
Georg Pfuetzenreuter	51e33815df	Add users conditional for sss ... Skip failing local users management on machines using sssd. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-01 22:25:28 +02:00
Georg Pfuetzenreuter	bfeeb8673e	Merge pull request 'Check files in nbroles to grains script' (#60) from nbroles-to-grains-refactor into production ... Reviewed-on: #60	2023-05-01 21:48:34 +02:00
Georg Pfuetzenreuter	de9ac40e3f	Check files in nbroles to grains script ... Script is called in the Lysergic repository as well, where not all files exist. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-01 21:45:13 +02:00
Georg Pfuetzenreuter	c951f48b71	Merge pull request 'Repair manage_firewall behavior' (#59) from firewall-optional into production ... Reviewed-on: #59	2023-05-01 20:39:02 +02:00
Georg Pfuetzenreuter	f96e9a4901	Repair manage_firewall behavior ... Fixup to b685f16c91, default value was outside of conditional - it didn't cause any errors, but did not work as expected either. :-) Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-01 20:35:27 +02:00
Georg Pfuetzenreuter	75c91e72cb	Merge pull request 'Set env_order + ping_on_rotate' (#58) from saltenv into production ... Reviewed-on: #58	2023-05-01 20:27:12 +02:00
Georg Pfuetzenreuter	2a9a5cf394	Set ping_on_rotate ... Enable option to ensure minions are immediately responsive after key rotations. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-01 20:24:13 +02:00
Georg Pfuetzenreuter	1089146801	Set env_order ... Option was removed in d4f39e8e5f, but the default environment seems to not be set to "production" without it being present. Adding it back until a better way is found. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-01 20:20:32 +02:00
Georg Pfuetzenreuter	27d178d852	Merge pull request 'Repair BookStack httpd configuration' (#57) from themis-httpd-fixup into production ... Reviewed-on: #57	2023-05-01 00:08:00 +02:00
Georg Pfuetzenreuter	841317e0f4	Repair BookStack httpd configuration ... - Replace wrong instances of RewriteCond with RewriteRule - Remove wrong quotes around rewrite conditions - Set correct options (seemingly our version of httpd does not set FollowSymLinks by default?) Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-01 00:00:31 +02:00
Georg Pfuetzenreuter	5f1793547b	Merge pull request 'Repair PrivateBin config quoting' (#56) from privatebin-quoting into production ... Reviewed-on: #56	2023-04-30 20:42:21 +02:00
Georg Pfuetzenreuter	942b71815e	Repair PrivateBin config quoting ... Ensure strings are quoted correctly. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-04-30 20:38:43 +02:00
Georg Pfuetzenreuter	edd16ff3a7	Merge pull request 'Repair undefined id' (#55) from common-id-var into production ... Reviewed-on: #55	2023-04-30 20:14:32 +02:00
Georg Pfuetzenreuter	1290fd5ec7	Repair undefined id ... Replace with call to grains dict. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-04-30 20:11:24 +02:00
Georg Pfuetzenreuter	f56ed6f64e	Merge pull request 'Adjust themis httpd directory options' (#50) from themis-httpd-fixup into production ... Reviewed-on: #50	2023-04-30 20:04:42 +02:00
Georg Pfuetzenreuter	d8263f9b80	Merge pull request 'Exclude libX11 removal for FPM hosts' (#54) from libX11-php into production ... Reviewed-on: #54	2023-04-30 19:58:19 +02:00
Georg Pfuetzenreuter	269b30ce9f	Exclude libX11 removal for FPM hosts ... Needed for some PHP extensions. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-04-30 19:48:36 +02:00
Georg Pfuetzenreuter	21f8818a52	Merge pull request 'Repair BookStack quoting' (#53) from bookstack-quoting into production ... Reviewed-on: #53	2023-04-30 19:00:05 +02:00