diff --git a/hosts/vm/perseverance/default.nix b/hosts/vm/perseverance/default.nix index 4c17f2d..fae1bf3 100644 --- a/hosts/vm/perseverance/default.nix +++ b/hosts/vm/perseverance/default.nix @@ -9,9 +9,9 @@ networking.hostName = "perseverance"; boot.loader.grub.devices = [ "/dev/sda" ]; - security.sudo.extraRule = [ + security.sudo.extraRules = [ { - group = [ "_user" ]; + groups = [ "_user" ]; commands = [ "ALL" ]; } ]; diff --git a/hosts/vm/perseverance/info.nix b/hosts/vm/perseverance/info.nix index c054154..0fbd964 100644 --- a/hosts/vm/perseverance/info.nix +++ b/hosts/vm/perseverance/info.nix @@ -12,7 +12,7 @@ homeNounou.enable = false; - users.root.passwordFile = ../../secrets/apprentix/root.age; + users.root.passwordFile = ../../../secrets/apprentix/root.age; resticClient.enable = false; } diff --git a/hosts/vm/perseverance/perseverance.nix b/hosts/vm/perseverance/perseverance.nix index 11e20a6..661fae1 100644 --- a/hosts/vm/perseverance/perseverance.nix +++ b/hosts/vm/perseverance/perseverance.nix @@ -1,4 +1,19 @@ -{ config, lib, ... }: +{ config, ... }: +let + cfg = config.services.forgejo; + srv = cfg.settings.server; +in { + services.openssh.settings.AcceptEnv = [ "GIT_PROTOCOL" ]; + + services.forgejo = { + enable = true; + + settings.server = { + DOMAIN = "git-test.crans.org"; + ROOT_URL = "https://${srv.DOMAIN}"; + HTTP_PORT = 3000; + }; + }; } diff --git a/hosts/vm/reverseproxy/reverseproxy.nix b/hosts/vm/reverseproxy/reverseproxy.nix index 3287e90..b5f813c 100644 --- a/hosts/vm/reverseproxy/reverseproxy.nix +++ b/hosts/vm/reverseproxy/reverseproxy.nix @@ -226,6 +226,9 @@ in serverAliases = [ "excel" ]; }; "framadate".proxyPass = "172.16.10.109"; + "git-test" = { + proxyPass = "172.16.10.137:3000"; + }; "grafana" = { proxyPass = "172.16.10.121:3000"; serverAliases = [ "fyre" ]; @@ -337,5 +340,5 @@ in }; }; }; - + }