imterah/nix-infra
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Revert "fix: Fixes mCaptcha and restart policy for some services"

Browse source 
This reverts commit 4c1e268644.
This commit is contained in:
Tera << 8 2025-05-08 15:49:55 -04:00
parent 4c1e268644
commit 606b94516f
Signed by: imterah
GPG key ID: 8FA7DD57BA6CEA37
4 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -23,9 +23,8 @@ This is a work-in-progress and currently is not production ready. Please check b
- [x] Install Passbolt - [x] Install Passbolt
- [x] Install Pterodactyl Panel - [x] Install Pterodactyl Panel
- [x] Install Immich - [x] Install Immich
- [ ] Install Synapse - [ ] Restore Forgejo
- [x] Restore Forgejo - [ ] Restore Passbolt
- [x] Restore Passbolt
- [ ] Restore Pterodactyl Panel - [ ] Restore Pterodactyl Panel
- [ ] Restore Immich (difficult!) - [ ] Restore Immich (difficult!)
- [ ] Get myself a treat :3 - [ ] Get myself a treat :3

4
hosts/andromeda/stacks/forgejo/docker-compose.nix
View file

@ -91,7 +91,7 @@
"FORGEJO__service__REQUIRE_CAPTCHA_FOR_LOGIN" = "true"; "FORGEJO__service__REQUIRE_CAPTCHA_FOR_LOGIN" = "true";
"FORGEJO__service__MCAPTCHA_URL" = "https://mcaptcha.terah.dev"; "FORGEJO__service__MCAPTCHA_URL" = "https://mcaptcha.terah.dev";
"FORGEJO__service__CAPTCHA_TYPE" = "mcaptcha"; "FORGEJO__service__CAPTCHA_TYPE" = "mcaptcha";
"FORGEJO__service__ENABLE_CAPTCHA" = "true"; "FORGEJO__service__ENABLE_CAPTCHA" = "false";
"FORGEJO__service__REGISTER_MANUAL_CONFIRM" = "true"; "FORGEJO__service__REGISTER_MANUAL_CONFIRM" = "true";
"FORGEJO__service__REQUIRE_EXTERNAL_REGISTRATION_CAPTCHA" = "true"; "FORGEJO__service__REQUIRE_EXTERNAL_REGISTRATION_CAPTCHA" = "true";
"USER_GID" = "1000"; "USER_GID" = "1000";
@ -122,7 +122,7 @@
systemd.services."docker-forgejo-server" = { systemd.services."docker-forgejo-server" = {
serviceConfig = { serviceConfig = {
Restart = lib.mkOverride 90 "unless-stopped"; Restart = lib.mkOverride 90 "always";
RestartMaxDelaySec = lib.mkOverride 90 "1m"; RestartMaxDelaySec = lib.mkOverride 90 "1m";
RestartSec = lib.mkOverride 90 "100ms"; RestartSec = lib.mkOverride 90 "100ms";
RestartSteps = lib.mkOverride 90 9; RestartSteps = lib.mkOverride 90 9;

4
hosts/andromeda/stacks/passbolt/docker-compose.nix
View file

@ -27,7 +27,7 @@
systemd.services."docker-passbolt-db" = { systemd.services."docker-passbolt-db" = {
serviceConfig = { serviceConfig = {
Restart = lib.mkOverride 90 "unless-stopped"; Restart = lib.mkOverride 90 "always";
RestartMaxDelaySec = lib.mkOverride 90 "1m"; RestartMaxDelaySec = lib.mkOverride 90 "1m";
RestartSec = lib.mkOverride 90 "100ms"; RestartSec = lib.mkOverride 90 "100ms";
RestartSteps = lib.mkOverride 90 9; RestartSteps = lib.mkOverride 90 9;
@ -77,7 +77,7 @@
systemd.services."docker-passbolt-passbolt" = { systemd.services."docker-passbolt-passbolt" = {
serviceConfig = { serviceConfig = {
Restart = lib.mkOverride 90 "unless-stopped"; Restart = lib.mkOverride 90 "always";
RestartMaxDelaySec = lib.mkOverride 90 "1m"; RestartMaxDelaySec = lib.mkOverride 90 "1m";
RestartSec = lib.mkOverride 90 "100ms"; RestartSec = lib.mkOverride 90 "100ms";
RestartSteps = lib.mkOverride 90 9; RestartSteps = lib.mkOverride 90 9;

6
hosts/andromeda/stacks/pterodactyl/docker-compose.nix
View file

@ -18,7 +18,7 @@
systemd.services."docker-pterodactyl-cache" = { systemd.services."docker-pterodactyl-cache" = {
serviceConfig = { serviceConfig = {
Restart = lib.mkOverride 90 "unless-stopped"; Restart = lib.mkOverride 90 "always";
RestartMaxDelaySec = lib.mkOverride 90 "1m"; RestartMaxDelaySec = lib.mkOverride 90 "1m";
RestartSec = lib.mkOverride 90 "100ms"; RestartSec = lib.mkOverride 90 "100ms";
RestartSteps = lib.mkOverride 90 9; RestartSteps = lib.mkOverride 90 9;
@ -58,7 +58,7 @@
systemd.services."docker-pterodactyl-database" = { systemd.services."docker-pterodactyl-database" = {
serviceConfig = { serviceConfig = {
Restart = lib.mkOverride 90 "unless-stopped"; Restart = lib.mkOverride 90 "always";
RestartMaxDelaySec = lib.mkOverride 90 "1m"; RestartMaxDelaySec = lib.mkOverride 90 "1m";
RestartSec = lib.mkOverride 90 "100ms"; RestartSec = lib.mkOverride 90 "100ms";
RestartSteps = lib.mkOverride 90 9; RestartSteps = lib.mkOverride 90 9;
@ -116,7 +116,7 @@
systemd.services."docker-pterodactyl-panel" = { systemd.services."docker-pterodactyl-panel" = {
serviceConfig = { serviceConfig = {
Restart = lib.mkOverride 90 "unless-stopped"; Restart = lib.mkOverride 90 "always";
RestartMaxDelaySec = lib.mkOverride 90 "1m"; RestartMaxDelaySec = lib.mkOverride 90 "1m";
RestartSec = lib.mkOverride 90 "100ms"; RestartSec = lib.mkOverride 90 "100ms";
RestartSteps = lib.mkOverride 90 9; RestartSteps = lib.mkOverride 90 9;