Merge remote-tracking branch 'pnp/master'

4 files changed, 93 insertions, 1 deletions

diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index 4fe3388c8..8c5295bb3 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -1,12 +1,35 @@
 { config, lib, pkgs, ... }:
 
+let
+  shack-ip = lib.head config.krebs.build.host.nets.shack.addrs4;
+  internal-ip = lib.head config.krebs.build.host.nets.retiolum.addrs4;
+in
 {
   imports = [
     ../2configs/base.nix
     <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
     ../2configs/collectd-base.nix
+    ../2configs/shack-nix-cacher.nix
+    ../2configs/shack-drivedroid.nix
   ];
+  # use your own binary cache, fallback use cache.nixos.org (which is used by
+  # apt-cacher-ng in first place)
+  nix.binaryCaches = [ "http://localhost:3142/nixos" "https://cache.nixos.org" ];
+
+  networking = {
+    firewall.enable = false;
+    interfaces.eth0.ip4 = [{
+      address = shack-ip;
+      prefixLength = 20;
+    }];
+
+    defaultGateway = "10.42.0.1";
+    nameservers = [ "8.8.8.8" ];
+  };
 
+  #####################
+  # uninteresting stuff
+  #####################
   krebs.build.host = config.krebs.hosts.wolf;
   # TODO rename shared user to "krebs"
   krebs.build.user = config.krebs.users.shared;
@@ -31,7 +54,7 @@
   fileSystems."/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; };
 
   swapDevices = [
-    { device = "/dev/disk/by-label/swap"; }
+    { device = "/dev/disk/by-label/swap";  }
   ];
 
   time.timeZone = "Europe/Berlin";
diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index c9f4ffa8d..df41eae1a 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -64,6 +64,8 @@ with lib;
     # TODO
     config.krebs.users.lass.pubkey
     config.krebs.users.makefu.pubkey
+    # TODO HARDER:
+    (readFile ../../krebs/Zpubkeys/makefu_omo.ssh.pub)
     config.krebs.users.tv.pubkey
   ];
 
diff --git a/shared/2configs/shack-drivedroid.nix b/shared/2configs/shack-drivedroid.nix
new file mode 100644
index 000000000..66940bc08
--- /dev/null
+++ b/shared/2configs/shack-drivedroid.nix
@@ -0,0 +1,42 @@
+{ pkgs, lib, config, ... }:
+let
+  repodir = "/var/srv/drivedroid";
+  srepodir = lib.shell.escape repodir;
+in
+{
+  systemd.paths.drivedroid = {
+    wantedBy = [ "multi-user.target" ];
+    Description = "triggers for changes in drivedroid dir";
+    pathConfig = {
+      PathModified = repodir;
+    };
+  };
+
+  systemd.services.drivedroid = {
+    ServiceConfig = {
+      ExecStartPre = pkgs.writeScript "prepare-drivedroid-repo-gen" ''
+        #!/bin/sh
+        mkdir -p ${srepodir}/repos
+      '';
+      ExecStart = pkgs.writeScript "start-drivedroid-repo-gen" ''
+        #!/bin/sh
+        {pkgs.drivedroid-gen-repo}/bin/drivedroid-gen-repo --chdir "${srepodir}" repos/ > "${srepodir}/main.json"
+      '';
+    };
+  };
+
+  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;
+        '');
+      };
+    };
+  };
+
+}
diff --git a/shared/2configs/shack-nix-cacher.nix b/shared/2configs/shack-nix-cacher.nix
new file mode 100644
index 000000000..7519bb3ac
--- /dev/null
+++ b/shared/2configs/shack-nix-cacher.nix
@@ -0,0 +1,25 @@
+{ pkgs, lib, ... }:
+
+{
+  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;
+  };
+}