Merge remote-tracking branch 'prism/master'

4 files changed, 44 insertions, 5 deletions

diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 9eb8cbf4..260f9608 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -63,9 +63,17 @@ in {
       }
       # <stockholm/makefu/2configs/syncthing.nix>
       <stockholm/makefu/2configs/remote-build/slave.nix>
-      <stockholm/makefu/2configs/deployment/google-muell.nix>
+      # TODO:
+      # <stockholm/makefu/2configs/deployment/google-muell.nix>
       <stockholm/makefu/2configs/virtualisation/docker.nix>
       <stockholm/makefu/2configs/bluetooth-mpd.nix>
+
+      {
+        # Risikoübernahme
+        nixpkgs.config.permittedInsecurePackages = [
+          "homeassistant-0.77.2"
+        ];
+      }
       <stockholm/makefu/2configs/deployment/homeautomation>
       {
         makefu.ps3netsrv = {
@@ -97,6 +105,7 @@ in {
 
     ];
   makefu.full-populate =  true;
+  nixpkgs.config.allowUnfree = true;
   krebs.rtorrent = (builtins.trace (builtins.toJSON config.services.telegraf.extraConfig)) {
     downloadDir = lib.mkForce "/media/cryptX/torrent";
     extraConfig = ''
diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix
index 24a3dddc..f2311fb5 100644
--- a/makefu/1systems/wbob/config.nix
+++ b/makefu/1systems/wbob/config.nix
@@ -45,7 +45,12 @@ in {
       # <stockholm/makefu/2configs/stats/telegraf/bamstats.nix>
       { environment.systemPackages = [ pkgs.vlc ]; }
 
-
+      {
+        # Risikoübernahme
+        nixpkgs.config.permittedInsecurePackages = [
+          "homeassistant-0.77.2"
+        ];
+      }
       <stockholm/makefu/2configs/deployment/bureautomation>
       <stockholm/makefu/2configs/deployment/bureautomation/mpd.nix>
       <stockholm/makefu/2configs/deployment/bureautomation/hass.nix>
diff --git a/makefu/2configs/nginx/download.binaergewitter.de.nix b/makefu/2configs/nginx/download.binaergewitter.de.nix
new file mode 100644
index 00000000..6b5687e7
--- /dev/null
+++ b/makefu/2configs/nginx/download.binaergewitter.de.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+let
+  ident = (toString <secrets>) + "/mirrorsync.gum.id_ed25519";
+in {
+  systemd.services.mirrorsync = {
+    startAt = "08:00:00";
+    path = with pkgs; [ rsync openssh ];
+    script = ''rsync -av -e "ssh -i ${ident}" mirrorsync@159.69.132.234:/var/www/html/ /var/www/binaergewitter'';
+  };
+  services.nginx = {
+    enable = lib.mkDefault true;
+    recommendedGzipSettings = true;
+    recommendedOptimisation = true;
+    virtualHosts."download.binaergewitter.de" = {
+        serverAliases = [ "dl2.binaergewitter.de" ];
+        root = "/var/www/binaergewitter";
+        extraConfig = ''
+          access_log /var/spool/nginx/logs/binaergewitter.access.log combined;
+          error_log /var/spool/nginx/logs/binaergewitter.error.log error;
+          autoindex on;
+        '';
+    };
+  };
+}
diff --git a/makefu/nixpkgs.json b/makefu/nixpkgs.json
index 73798f44..ae35f9e7 100644
--- a/makefu/nixpkgs.json
+++ b/makefu/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/makefu/nixpkgs",
-  "rev": "bf46294e4cf20649182f76fc9200a48436f5874a",
-  "date": "2018-09-18T02:20:45+02:00",
-  "sha256": "13900gack7pgf5a7c11x30rzb3s0kjpbm2z2g8fw4720cr9lkd94",
+  "rev": "9728b2e83406c76efc734ebb1923f23b8e687819",
+  "date": "2018-11-19T20:36:35+01:00",
+  "sha256": "0nk75ldppjr6x04hgghgg9vanr1cw4k5xhg699d38g2rpxviz5bp",
   "fetchSubmodules": false
 }