diff --git a/configuration.nix b/configuration.nix index 637bc8c..0d7f7a8 100755 --- a/configuration.nix +++ b/configuration.nix @@ -12,7 +12,8 @@ networking.domain = ""; networking.firewall = { enable = true; - allowedTCPPorts = [80 443]; + allowedTCPPorts = [80 443 9418]; + allowedUDPPorts = [80 443 9418]; }; boot.loader.grub.devices = ["nodev"]; diff --git a/flake.lock b/flake.lock index 8a24838..14ff216 100755 --- a/flake.lock +++ b/flake.lock @@ -54,6 +54,24 @@ "url": "file:///var/lib/git-server/jank-client-fork.git" } }, + "math-project": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1749728695, + "narHash": "sha256-ZeWhAif+eh/ObPxceqQcuvtvxreXTNcHnhWEbPAuppM=", + "ref": "refs/heads/master", + "rev": "c35a0b510854103f466adca6b60f50822893daca", + "revCount": 5, + "type": "git", + "url": "file:///var/lib/git-server/math-project.git" + }, + "original": { + "type": "git", + "url": "file:///var/lib/git-server/math-project.git" + } + }, "nixpkgs": { "locked": { "lastModified": 1749143949, @@ -85,6 +103,21 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1748889542, + "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-25.05", + "type": "indirect" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1749658098, "narHash": "sha256-VCerWubROWYfKu027Y4IZdtjN+3qr2WCGhX+mUGW5wk=", @@ -100,7 +133,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1714253743, "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", @@ -116,7 +149,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1746141548, "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", @@ -134,7 +167,7 @@ }, "noshell": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1717396029, @@ -154,7 +187,8 @@ "inputs": { "elmskell-blog": "elmskell-blog", "jank-client": "jank-client", - "nixpkgs": "nixpkgs_3", + "math-project": "math-project", + "nixpkgs": "nixpkgs_4", "noshell": "noshell", "spacebar-server": "spacebar-server" } @@ -162,7 +196,7 @@ "spacebar-server": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1748414795, diff --git a/flake.nix b/flake.nix index 06490e0..e537199 100755 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,7 @@ inherit system; inherit elmskell-blog; inherit spacebar-server; + inherit math-project; ssh-pub-keys = import ./ssh-pub-keys.nix; }; modules = [ @@ -46,8 +47,8 @@ noshell.nixosModules.default {programs.noshell.enable = true;} - math-project.nixosModules.default - {programs.math-project.enable = true;} + math-project.nixosModules.x86_64-linux.default + {services.math-project.enable = true;} ./services/math-project.nix ./configuration.nix diff --git a/services/math-project.nix b/services/math-project.nix index af31585..a541708 100755 --- a/services/math-project.nix +++ b/services/math-project.nix @@ -29,7 +29,7 @@ in { METRICS_BIND = "[::1]:9283"; METRICS_BIND_NETWORK = "tcp"; POLICY_FNAME = "/etc/anubis/math-project.botPolicies.yaml"; - TARGET = "http://localhost:8080"; + TARGET = "http://localhost:8081"; }; }; }; @@ -42,7 +42,7 @@ in { systemd.services.math-project = { serviceConfig = { Type = "simple"; - ExecStart = "${lib.getExe math-project}"; + ExecStart = "${lib.getExe math-project.packages.x86_64-linux.default}"; RemainAfterExit = true; }; }; diff --git a/services/rgit.nix b/services/rgit.nix index 96c628e..582f15f 100755 --- a/services/rgit.nix +++ b/services/rgit.nix @@ -7,6 +7,7 @@ image = "ghcr.io/w4/rgit:main"; ports = [ "8000:8000" + "9418:9418" ]; volumes = [ "/var/lib/git-server:/git:ro"