diff options
| author | makefu <github@syntax-fehler.de> | 2016-12-24 15:39:37 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-12-24 15:39:37 +0100 |
| commit | 78c50fe49599b5c3dd147ebd23253fa2abe53998 (patch) | |
| tree | 6d609ffc1c59ed6bdb35ef354c5b96de7858e778 /krebs | |
| parent | d385e3c6968d9317b7d8adea3671c79258a24cec (diff) | |
| parent | bece7d9da29adde2c79e49c40d975dc46eed4c1e (diff) | |
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/backup.nix | 3 | ||||
| -rw-r--r-- | krebs/3modules/git.nix | 41 |
2 files changed, 21 insertions, 23 deletions
diff --git a/krebs/3modules/backup.nix b/krebs/3modules/backup.nix index 96b28300..bfb0ab59 100644 --- a/krebs/3modules/backup.nix +++ b/krebs/3modules/backup.nix @@ -137,6 +137,9 @@ let echo >&2 "update snapshot current; $rsync_dst <- $rsync_src" ''; }} + # In `dst-rsync`'s `mkdir m 0700 -p` above, we care only about permission + # of the deepest directory: + # shellcheck disable=SC2174 ${local.rsync} >&2 \ -aAXF --delete \ --rsh=${shell.escape ssh} \ diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix index 20907a3e..16483184 100644 --- a/krebs/3modules/git.nix +++ b/krebs/3modules/git.nix @@ -400,29 +400,24 @@ let chown ${toString cfg.cgit.fcgiwrap.user.uid}:${toString cfg.cgit.fcgiwrap.group.gid} ${cfg.cgit.settings.cache-root} ''; - krebs.nginx = { - enable = true; - servers.cgit = { - server-names = [ - "cgit.${config.networking.hostName}" - "cgit.${config.networking.hostName}.r" - "cgit.${config.networking.hostName}.retiolum" - ]; - locations = [ - (nameValuePair "/" '' - include ${pkgs.nginx}/conf/fastcgi_params; - fastcgi_param SCRIPT_FILENAME ${pkgs.cgit}/cgit/cgit.cgi; - fastcgi_param PATH_INFO $uri; - fastcgi_param QUERY_STRING $args; - fastcgi_param HTTP_HOST $server_name; - fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; - '') - (nameValuePair "/static/" '' - root ${pkgs.cgit}/cgit; - rewrite ^/static(/.*)$ $1 break; - '') - ]; - }; + services.nginx.virtualHosts.cgit = { + serverAliases = [ + "cgit.${config.networking.hostName}" + "cgit.${config.networking.hostName}.r" + "cgit.${config.networking.hostName}.retiolum" + ]; + locations."/".extraConfig = '' + include ${pkgs.nginx}/conf/fastcgi_params; + fastcgi_param SCRIPT_FILENAME ${pkgs.cgit}/cgit/cgit.cgi; + fastcgi_param PATH_INFO $uri; + fastcgi_param QUERY_STRING $args; + fastcgi_param HTTP_HOST $server_name; + fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; + ''; + locations."/static/".extraConfig = '' + root ${pkgs.cgit}/cgit; + rewrite ^/static(/.*)$ $1 break; + ''; }; }; |