diff options
| -rw-r--r-- | aphrodite/devops/msci.nix | 19 | ||||
| -rw-r--r-- | flake.lock | 38 |
2 files changed, 47 insertions, 10 deletions
diff --git a/aphrodite/devops/msci.nix b/aphrodite/devops/msci.nix index a37fdf7..489a986 100644 --- a/aphrodite/devops/msci.nix +++ b/aphrodite/devops/msci.nix @@ -1,8 +1,23 @@ -{ +{config, ...}: let + buildDomain = "build.${config.customOps.domain.fqdn}"; +in { sops.secrets = { "msci/taur/sshkey" = {}; "msci/taur/gpgkey" = {}; "msci/taur/gpgpwd" = {}; }; - makeshiftci.enable = true; + makeshiftci = { + enable = true; + webUI.enable = true; + }; + services.nginx.virtualHosts.${buildDomain} = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:${builtins.toString config.makeshiftci.webUI.port}"; + extraConfig = '' + proxy_buffering off; + ''; + }; + }; } @@ -102,14 +102,15 @@ }, "makeshiftci": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1778242936, - "narHash": "sha256-yikLxw5CXGvYdLR7N3EupmchGJTWtpIakSdsiWiEv9c=", + "lastModified": 1778808191, + "narHash": "sha256-lTPMplpLOPOuMPHTSITMX6IRP3am5b4QnaqKIPHj5Mk=", "ref": "refs/heads/main", - "rev": "f3eff3b525fdad1677a489188ea459e5f0a6d419", - "revCount": 9, + "rev": "4a17d522ced7e9b775570afd6ccbbbe225f957c3", + "revCount": 24, "type": "git", "url": "https://git.toufy.me/makeshiftci" }, @@ -136,11 +137,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1778003029, - "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", + "lastModified": 1778430510, + "narHash": "sha256-Ti+ZBvW6yrWWAg2szExVTwCd4qOJ3KlVr1tFHfyfi8Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", + "rev": "8fd9daa3db09ced9700431c5b7ad0e8ba199b575", "type": "github" }, "original": { @@ -166,6 +167,27 @@ "type": "github" } }, + "pyproject-nix": { + "inputs": { + "nixpkgs": [ + "makeshiftci", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1776715674, + "narHash": "sha256-Gs1VnEkCkkRZxJQAC/Dhz0Jbfi22mFXChbtNg9w/Ybg=", + "owner": "nix-community", + "repo": "pyproject.nix", + "rev": "69f57f27e52a87c54e28138a75ec741cd46663c9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "pyproject.nix", + "type": "github" + } + }, "root": { "inputs": { "disko": "disko", |