From 72f465f719d362fb54c061979d2ad87a5c203b5b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 22 Dec 2016 20:53:04 +0100
Subject: krebs.backup: shellcheck disable=SC2174

---
 krebs/3modules/backup.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'krebs')

diff --git a/krebs/3modules/backup.nix b/krebs/3modules/backup.nix
index 96b283002..bfb0ab591 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} \
-- 
cgit v1.2.3


From 4955ba48c140008f4ccbec73eb52e28a0e64d807 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 23 Dec 2016 09:07:23 +0100
Subject: cgit service: use services.nginx.virtualHosts

---
 krebs/3modules/git.nix | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix
index 20907a3ed..164831846 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;
+      '';
     };
   };
 
-- 
cgit v1.2.3