diff options
| author | Kjetil Orbekk <kj@orbekk.com> | 2021-07-13 08:33:53 -0400 |
|---|---|---|
| committer | Kjetil Orbekk <kj@orbekk.com> | 2021-07-13 08:33:53 -0400 |
| commit | ee293b3cd50536a714b8d149bcbc8dd7d5f6f4ea (patch) | |
| tree | 90826caa0575c5b0267643aedfeac74bd4c30fb7 | |
| parent | 5c8efb372182d82d02b33329c92901c5fb93b6f9 (diff) | |
update
| -rw-r--r-- | config/cgit.nix | 5 | ||||
| -rw-r--r-- | config/fcgiwrap.nix | 15 | ||||
| -rw-r--r-- | machines/dragon.nix | 1 |
3 files changed, 2 insertions, 19 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"; - }; -} diff --git a/machines/dragon.nix b/machines/dragon.nix index 0133019..54bb28a 100644 --- a/machines/dragon.nix +++ b/machines/dragon.nix @@ -13,7 +13,6 @@ 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; |