From 7074efe2179ac3d7a88544c0605b1d7e7c9212fc Mon Sep 17 00:00:00 2001 From: muon Date: Thu, 2 Jan 2025 15:13:55 +0000 Subject: [PATCH] Move grav --- modules/nixos/server/grav/default.nix | 7 +++++-- modules/nixos/server/grav/service.nix | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/modules/nixos/server/grav/default.nix b/modules/nixos/server/grav/default.nix index b3bdfaa..2906070 100644 --- a/modules/nixos/server/grav/default.nix +++ b/modules/nixos/server/grav/default.nix @@ -12,10 +12,13 @@ in with lib; { }; }; - config = { - networking.firewall = { allowedTCPPorts = [ 443 80 ]; }; + config = let port = 5001; + in { + networking.firewall = { allowedTCPPorts = [ port ]; }; services.grav = mkIf cfg.grav.enable { + inherit port; enable = true; + root = "/curr/grav/grav"; phpPackage = pkgs.php81; }; users.users.${config.mods.user.name}.extraGroups = lib.mkAfter [ "grav" ]; diff --git a/modules/nixos/server/grav/service.nix b/modules/nixos/server/grav/service.nix index cc3d416..eeb2347 100644 --- a/modules/nixos/server/grav/service.nix +++ b/modules/nixos/server/grav/service.nix @@ -59,6 +59,17 @@ in { ''; }; + addr = mkOption { + type = types.str; + description = "IP address."; + default = "0.0.0.0"; + }; + port = mkOption { + type = types.nullOr types.port; + description = "Port number."; + default = 3000; + }; + phpPackage = mkPackageOption pkgs "php" { }; maxUploadSize = mkOption { @@ -153,10 +164,16 @@ in { services.nginx = mkIf (cfg.virtualHost != null) { enable = true; + virtualHosts = { ${cfg.virtualHost} = { root = "${servedRoot}"; + listen = [{ + addr = cfg.addr; + port = cfg.port; + }]; + locations = { "= /robots.txt" = { priority = 100;