diff options
-rw-r--r-- | config/cgit.nix | 10 | ||||
-rw-r--r-- | machines/dragon.nix | 1 | ||||
-rw-r--r-- | modules/fcgiwrap.nix | 23 |
3 files changed, 30 insertions, 4 deletions
diff --git a/config/cgit.nix b/config/cgit.nix index a9f34b8..91d1c95 100644 --- a/config/cgit.nix +++ b/config/cgit.nix @@ -16,8 +16,7 @@ let repository-sort=age enable-html-serving=1 ''; -in -{ +in { imports = [ ./fcgiwrap.nix ]; networking.firewall.allowedTCPPorts = [ gitPort ]; @@ -27,7 +26,10 @@ in virtualHosts = { "git-internal" = { root = "${pkgs.cgit}/cgit"; - listen = [{ addr = "*"; port = gitPort; }]; + listen = [{ + addr = "*"; + port = gitPort; + }]; extraConfig = "try_files $uri @cgit;"; locations."/git/" = { extraConfig = '' @@ -42,7 +44,7 @@ in fastcgi_param PATH_INFO $uri; fastcgi_param QUERY_STRING $args; fastcgi_param HTTP_HOST $server_name; - fastcgi_pass 127.0.0.1:${toString fcgiPort}; + fastcgi_pass unix:${services.fcgiwrap.socketAddress}; ''; }; }; diff --git a/machines/dragon.nix b/machines/dragon.nix index 54bb28a..0133019 100644 --- a/machines/dragon.nix +++ b/machines/dragon.nix @@ -13,6 +13,7 @@ in { orbekk.monitoring-server.enable = true; orbekk.postfix.enable = true; orbekk.nextcloud.enable = true; + orbekk.fcgiwrap.enable = true; environment.systemPackages = with pkgs; [ ipmitool ]; programs.mosh.enable = true; diff --git a/modules/fcgiwrap.nix b/modules/fcgiwrap.nix new file mode 100644 index 0000000..a3666a6 --- /dev/null +++ b/modules/fcgiwrap.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.orbekk.fcgiwrap; + aliases = import ../data/aliases.nix; +in { + options = { + orbekk.fcgiwrap = { + enable = lib.mkEnableOption "Enable monitoring server"; + }; + }; + + config = lib.mkIf cfg.enable { + services.fcgiwrap = { + enable = true; + socketType = "unix"; + # socketType = "tcp"; + # socketAddress = "0.0.0.0:${toString fcgiPort}"; + user = "fcgi"; + group = "fcgi"; + }; + }; +} |