diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/cgit.nix | 5 | ||||
| -rw-r--r-- | config/fcgiwrap.nix | 15 |
2 files changed, 2 insertions, 18 deletions
diff --git a/config/cgit.nix b/config/cgit.nix index 91d1c95..9d69095 100644 --- a/config/cgit.nix +++ b/config/cgit.nix @@ -17,8 +17,7 @@ let enable-html-serving=1 ''; in { - imports = [ ./fcgiwrap.nix ]; - + orbekk.fcgiwrap.enable = true; networking.firewall.allowedTCPPorts = [ gitPort ]; services.nginx = { @@ -44,7 +43,7 @@ in { fastcgi_param PATH_INFO $uri; fastcgi_param QUERY_STRING $args; fastcgi_param HTTP_HOST $server_name; - fastcgi_pass unix:${services.fcgiwrap.socketAddress}; + fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; ''; }; }; diff --git a/config/fcgiwrap.nix b/config/fcgiwrap.nix deleted file mode 100644 index ab08436..0000000 --- a/config/fcgiwrap.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, pkgs, ... }: -let - fcgiPort = (import ../data/aliases.nix).services.fcgi.port; -in -{ - networking.firewall.allowedTCPPorts = [ fcgiPort ]; - - services.fcgiwrap = { - enable = true; - socketType = "tcp"; - socketAddress = "0.0.0.0:${toString fcgiPort}"; - user = "fcgi"; - group = "fcgi"; - }; -} |