From 48de4d6ae353d7df0259b53d01c97c12fdb6dd66 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 17 Apr 2017 15:46:45 +0200
Subject: shared shack-drivedroid: krebs.nginx -> services.nginx

---
 shared/2configs/shack-drivedroid.nix | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'shared/2configs')

diff --git a/shared/2configs/shack-drivedroid.nix b/shared/2configs/shack-drivedroid.nix
index 3581f9e96..07fcffa42 100644
--- a/shared/2configs/shack-drivedroid.nix
+++ b/shared/2configs/shack-drivedroid.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ config, pkgs, ... }:
 with import <stockholm/lib>;
 let
   repodir = "/var/srv/drivedroid";
@@ -7,6 +7,20 @@ in
 {
   environment.systemPackages = [ pkgs.drivedroid-gen-repo ];
 
+  services.nginx = {
+    enable = mkDefault true;
+    virtualHosts.shack-drivedroid = {
+      serverAliases = [
+        "drivedroid.shack"
+      ];
+      # TODO: prepare this somehow
+      locations."/".extraConfig = ''
+        root ${repodir};
+        index main.json;
+      '';
+    };
+  };
+
   systemd.services.drivedroid = {
     description = "generates drivedroid repo file";
     restartIfChanged = true;
@@ -27,18 +41,4 @@ in
       '';
     };
   };
-
-  krebs.nginx = {
-    enable = lib.mkDefault true;
-    servers = {
-      drivedroid-repo = {
-        server-names = [ "drivedroid.shack" ];
-        # TODO: prepare this somehow
-        locations = lib.singleton (lib.nameValuePair "/" ''
-          root ${repodir};
-          index main.json;
-        '');
-      };
-    };
-  };
 }
-- 
cgit v1.2.3


From 0b89efb90ee7e8d4d39246da7dcde4d4bb7ad273 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 17 Apr 2017 15:47:07 +0200
Subject: shared shack-nix-cacher: krebs.nginx -> services.nginx

---
 shared/2configs/shack-nix-cacher.nix | 37 +++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'shared/2configs')

diff --git a/shared/2configs/shack-nix-cacher.nix b/shared/2configs/shack-nix-cacher.nix
index 7519bb3ac..4fcbf3a4e 100644
--- a/shared/2configs/shack-nix-cacher.nix
+++ b/shared/2configs/shack-nix-cacher.nix
@@ -1,25 +1,28 @@
-{ pkgs, lib, ... }:
-
+{ config, pkgs, ... }:
+with import <stockholm/lib>;
+let
+  cfg = config.krebs.apt-cacher-ng;
+in
 {
-  krebs.nginx = {
-    enable = lib.mkDefault true;
-    servers = {
-      apt-cacher-ng = {
-        server-names = [ "acng.shack" ];
-        locations = lib.singleton (lib.nameValuePair "/" ''
-          proxy_set_header   Host $host;
-          proxy_set_header   X-Real-IP          $remote_addr;
-          proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_pass http://localhost:3142/;
-        '');
-      };
-    };
-  };
-
   krebs.apt-cacher-ng = {
     enable = true;
     port = 3142;
     bindAddress = "localhost";
     cacheExpiration = 30;
   };
+
+  services.nginx = {
+    enable = mkDefault true;
+    virtualHosts.shack-nix-cacher = {
+      serverAliases = [
+        "acng.shack"
+      ];
+      locations."/".extraConfig = ''
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://localhost:${toString cfg.port}/;
+      '';
+    };
+  };
 }
-- 
cgit v1.2.3


From 9cb758c1cbabdfc8f186d78d52992510766f934e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 17 Apr 2017 15:59:27 +0200
Subject: shared shack-drivedroid: cleanup

---
 shared/2configs/shack-drivedroid.nix | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'shared/2configs')

diff --git a/shared/2configs/shack-drivedroid.nix b/shared/2configs/shack-drivedroid.nix
index 07fcffa42..12e4a39c3 100644
--- a/shared/2configs/shack-drivedroid.nix
+++ b/shared/2configs/shack-drivedroid.nix
@@ -1,8 +1,7 @@
 { config, pkgs, ... }:
 with import <stockholm/lib>;
 let
-  repodir = "/var/srv/drivedroid";
-  srepodir = shell.escape repodir;
+  root = "/var/srv/drivedroid";
 in
 {
   environment.systemPackages = [ pkgs.drivedroid-gen-repo ];
@@ -15,28 +14,34 @@ in
       ];
       # TODO: prepare this somehow
       locations."/".extraConfig = ''
-        root ${repodir};
+        root ${root};
         index main.json;
       '';
     };
   };
 
-  systemd.services.drivedroid = {
+  systemd.services.drivedroid-gen-repo = {
     description = "generates drivedroid repo file";
-    restartIfChanged = true;
+    path = [
+      pkgs.coreutils
+      pkgs.drivedroid-gen-repo
+      pkgs.inotify-tools
+    ];
     wantedBy = [ "multi-user.target" ];
 
     serviceConfig = {
       Type = "simple";
       Restart = "always";
-      ExecStartPre = pkgs.writeScript "prepare-drivedroid-gen-repo" ''
-        #!/bin/sh
-        mkdir -p ${srepodir}/repos
+      ExecStartPre = pkgs.writeDash "prepare-drivedroid-gen-repo" ''
+        mkdir -p ${root}/repos
       '';
-      ExecStart = pkgs.writeScript "start-drivedroid-gen-repo" ''
-        #!/bin/sh
+      ExecStart = pkgs.writeDash "start-drivedroid-gen-repo" ''
+        set -efu
+        cd ${root}
         while sleep 60; do
-          ${pkgs.inotify-tools}/bin/inotifywait -r ${srepodir} && ${pkgs.drivedroid-gen-repo}/bin/drivedroid-gen-repo --chdir "${srepodir}" repos/ > "${srepodir}/main.json"
+          if inotifywait -r .; then
+            drivedroid-gen-repo repos > main.json
+          fi
         done
       '';
     };
-- 
cgit v1.2.3