diff options
author | Wout Mertens <Wout.Mertens@gmail.com> | 2018-04-07 14:39:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-07 14:39:51 +0200 |
commit | d55e830982f3e24b4f6be8103b1da656301b9741 (patch) | |
tree | 3822db223bec184dc51a96a092ca0bcc69f999cb /nixos/modules/services | |
parent | 6c3186848d0a672233569a5579fafd69423b4b39 (diff) | |
parent | 073089914e7890960ffa4cc5b57b18950d90ba37 (diff) | |
download | nixlib-d55e830982f3e24b4f6be8103b1da656301b9741.tar nixlib-d55e830982f3e24b4f6be8103b1da656301b9741.tar.gz nixlib-d55e830982f3e24b4f6be8103b1da656301b9741.tar.bz2 nixlib-d55e830982f3e24b4f6be8103b1da656301b9741.tar.lz nixlib-d55e830982f3e24b4f6be8103b1da656301b9741.tar.xz nixlib-d55e830982f3e24b4f6be8103b1da656301b9741.tar.zst nixlib-d55e830982f3e24b4f6be8103b1da656301b9741.zip |
Merge pull request #38527 from gnidorah/gitweb
nixos/nginx: fix gitweb submodule
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/misc/gitweb.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/web-servers/nginx/gitweb.nix | 29 |
2 files changed, 13 insertions, 17 deletions
diff --git a/nixos/modules/services/misc/gitweb.nix b/nixos/modules/services/misc/gitweb.nix index 8e4d85a1e15f..b0e34a690ca5 100644 --- a/nixos/modules/services/misc/gitweb.nix +++ b/nixos/modules/services/misc/gitweb.nix @@ -28,6 +28,7 @@ in example = '' $feature{'highlight'}{'default'} = [1]; $feature{'ctags'}{'default'} = [1]; + $feature{'avatar'}{'default'} = ['gravatar']; ''; }; diff --git a/nixos/modules/services/web-servers/nginx/gitweb.nix b/nixos/modules/services/web-servers/nginx/gitweb.nix index 344c1f7b8aa4..3dc3ebc7e4c2 100644 --- a/nixos/modules/services/web-servers/nginx/gitweb.nix +++ b/nixos/modules/services/web-servers/nginx/gitweb.nix @@ -22,36 +22,31 @@ in config = mkIf config.services.nginx.gitweb.enable { - systemd.sockets.gitweb = { - description = "GitWeb Listen Socket"; - listenStreams = [ "/run/gitweb.sock" ]; - socketConfig = { - Accept = "false"; - SocketUser = "nginx"; - SocketGroup = "nginx"; - SocketMode = "0600"; - }; - wantedBy = [ "sockets.target" ]; - }; systemd.services.gitweb = { description = "GitWeb service"; - script = "${git}/share/gitweb/gitweb.cgi --fcgi"; + script = "${pkgs.git}/share/gitweb/gitweb.cgi --fastcgi --nproc=1"; + environment = { + FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock"; + }; serviceConfig = { - Type = "simple"; - StandardInput = "socket"; User = "nginx"; Group = "nginx"; + RuntimeDirectory = [ "gitweb" ]; }; + wantedBy = [ "multi-user.target" ]; }; services.nginx = { virtualHosts.default = { - locations."/gitweb" = { - root = "${pkgs.git}/share/gitweb"; + locations."/gitweb/" = { + root = "${pkgs.git}/share"; + tryFiles = "$uri @gitweb"; + }; + locations."@gitweb" = { extraConfig = '' include ${pkgs.nginx}/conf/fastcgi_params; fastcgi_param GITWEB_CONFIG ${cfg.gitwebConfigFile}; - fastcgi_pass unix:/run/gitweb.sock; + fastcgi_pass unix:/run/gitweb/gitweb.sock; ''; }; }; |