diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2018-04-17 20:06:44 +0300 |
|---|---|---|
| committer | gnidorah <gnidorah@users.noreply.github.com> | 2018-04-17 20:07:01 +0300 |
| commit | 9029ed933c69287c64a30d40b6b4f9f1ace7dd94 (patch) | |
| tree | 3ce069646e63b7d4cee63874265337e41c6fb6a9 /nixos/modules/services/web-servers | |
| parent | a415a95e7c520b1f0f86c9729a54f5c8e7bd416c (diff) | |
| download | nixlib-9029ed933c69287c64a30d40b6b4f9f1ace7dd94.tar nixlib-9029ed933c69287c64a30d40b6b4f9f1ace7dd94.tar.gz nixlib-9029ed933c69287c64a30d40b6b4f9f1ace7dd94.tar.bz2 nixlib-9029ed933c69287c64a30d40b6b4f9f1ace7dd94.tar.lz nixlib-9029ed933c69287c64a30d40b6b4f9f1ace7dd94.tar.xz nixlib-9029ed933c69287c64a30d40b6b4f9f1ace7dd94.tar.zst nixlib-9029ed933c69287c64a30d40b6b4f9f1ace7dd94.zip | |
nixos/gitweb: add gitwebTheme option
Diffstat (limited to 'nixos/modules/services/web-servers')
| -rw-r--r-- | nixos/modules/services/web-servers/lighttpd/gitweb.nix | 7 | ||||
| -rw-r--r-- | nixos/modules/services/web-servers/nginx/gitweb.nix | 12 |
2 files changed, 12 insertions, 7 deletions
diff --git a/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix index 37128d90401d..c494d6966a7f 100644 --- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix +++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix @@ -4,6 +4,9 @@ with lib; let cfg = config.services.gitweb; + package = pkgs.gitweb.override (optionalAttrs cfg.gitwebTheme { + gitwebTheme = true; + }); in { @@ -34,8 +37,8 @@ in "^/gitweb$" => "/gitweb/" ) alias.url = ( - "/gitweb/static/" => "${pkgs.git}/share/gitweb/static/", - "/gitweb/" => "${pkgs.git}/share/gitweb/gitweb.cgi" + "/gitweb/static/" => "${package}/static/", + "/gitweb/" => "${package}/gitweb.cgi" ) setenv.add-environment = ( "GITWEB_CONFIG" => "${cfg.gitwebConfigFile}", diff --git a/nixos/modules/services/web-servers/nginx/gitweb.nix b/nixos/modules/services/web-servers/nginx/gitweb.nix index 3dc3ebc7e4c2..272fd1480185 100644 --- a/nixos/modules/services/web-servers/nginx/gitweb.nix +++ b/nixos/modules/services/web-servers/nginx/gitweb.nix @@ -4,6 +4,9 @@ with lib; let cfg = config.services.gitweb; + package = pkgs.gitweb.override (optionalAttrs cfg.gitwebTheme { + gitwebTheme = true; + }); in { @@ -24,7 +27,7 @@ in systemd.services.gitweb = { description = "GitWeb service"; - script = "${pkgs.git}/share/gitweb/gitweb.cgi --fastcgi --nproc=1"; + script = "${package}/gitweb.cgi --fastcgi --nproc=1"; environment = { FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock"; }; @@ -38,11 +41,10 @@ in services.nginx = { virtualHosts.default = { - locations."/gitweb/" = { - root = "${pkgs.git}/share"; - tryFiles = "$uri @gitweb"; + locations."/gitweb/static/" = { + alias = "${package}/static/"; }; - locations."@gitweb" = { + locations."/gitweb/" = { extraConfig = '' include ${pkgs.nginx}/conf/fastcgi_params; fastcgi_param GITWEB_CONFIG ${cfg.gitwebConfigFile}; |