cgit service: use services.nginx.virtualHosts

This commit is contained in:
tv 2016-12-23 09:07:23 +01:00
parent f063555eda
commit 4955ba48c1

View File

@ -400,29 +400,24 @@ let
chown ${toString cfg.cgit.fcgiwrap.user.uid}:${toString cfg.cgit.fcgiwrap.group.gid} ${cfg.cgit.settings.cache-root} chown ${toString cfg.cgit.fcgiwrap.user.uid}:${toString cfg.cgit.fcgiwrap.group.gid} ${cfg.cgit.settings.cache-root}
''; '';
krebs.nginx = { services.nginx.virtualHosts.cgit = {
enable = true; serverAliases = [
servers.cgit = {
server-names = [
"cgit.${config.networking.hostName}" "cgit.${config.networking.hostName}"
"cgit.${config.networking.hostName}.r" "cgit.${config.networking.hostName}.r"
"cgit.${config.networking.hostName}.retiolum" "cgit.${config.networking.hostName}.retiolum"
]; ];
locations = [ locations."/".extraConfig = ''
(nameValuePair "/" ''
include ${pkgs.nginx}/conf/fastcgi_params; include ${pkgs.nginx}/conf/fastcgi_params;
fastcgi_param SCRIPT_FILENAME ${pkgs.cgit}/cgit/cgit.cgi; fastcgi_param SCRIPT_FILENAME ${pkgs.cgit}/cgit/cgit.cgi;
fastcgi_param PATH_INFO $uri; fastcgi_param PATH_INFO $uri;
fastcgi_param QUERY_STRING $args; fastcgi_param QUERY_STRING $args;
fastcgi_param HTTP_HOST $server_name; fastcgi_param HTTP_HOST $server_name;
fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; fastcgi_pass unix:${config.services.fcgiwrap.socketAddress};
'') '';
(nameValuePair "/static/" '' locations."/static/".extraConfig = ''
root ${pkgs.cgit}/cgit; root ${pkgs.cgit}/cgit;
rewrite ^/static(/.*)$ $1 break; rewrite ^/static(/.*)$ $1 break;
'') '';
];
};
}; };
}; };