diff --git a/nix/application/containers.nix b/nix/application/containers.nix index fa0b702..1b23cca 100644 --- a/nix/application/containers.nix +++ b/nix/application/containers.nix @@ -75,8 +75,12 @@ softserve = { image = "charmcli/soft-serve:v0.7.3"; - ports = [ "23231:23231" "23232:23232" - "23233:23233" "9418:9418" ]; + ports = [ + "23231:23231" + "23232:23232" + "23233:23233" + "9418:9418" + ]; volumes = [ "/home/sezycei/srv/containerdata/soft-serve/data:/soft-serve" ]; environment = { SOFT_SERVE_NAME = "git.eversole.co"; diff --git a/nix/application/nginx.nix b/nix/application/nginx.nix index 9f55619..0aa5f71 100644 --- a/nix/application/nginx.nix +++ b/nix/application/nginx.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: { +{ config, lib, pkgs,... }: { services.nginx = { enable = true; @@ -58,7 +58,13 @@ "food.eversole.co" = proxied { target = "http://127.0.0.1:52230"; }; - "git.eversole.co" = static { dir = "/var/www/jame.su"; }; + "git.eversole.co" = { + enableACME = true; + forceSSL = true; + locations."/" = { root = "/var/www/git.eversole.co"; tryFiles = "$uri $uri/ @git"; }; + locations."/purr".return = "301 https://git.eversole.co"; + locations."@git" = { proxyPass = "http://127.0.0.1:23232"; priority = 600; }; + }; "graf.matri.cx" = { root = "/var/www/graf.matri.cx"; }; # refer to /monitoring/nginx.nix "hydra.matri.cx" = proxied { target = "http://127.0.0.1:3034";