Merge 'cd/master' - update krebs.build.source

1systems/omo.nix

@@ -40,7 +40,7 @@ in {
   networking.firewall.allowedTCPPorts = [ 80 655 8080 ];
 
   # services.openssh.allowSFTP = false;
-  krebs.build.source.git.nixpkgs.rev = "d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce";
+  krebs.build.source.nixpkgs.rev = "d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce";
 
   # copy config from <secrets/sabnzbd.ini> to /var/lib/sabnzbd/
   services.sabnzbd.enable = true;

1systems/vbob.nix

@@ -37,8 +37,8 @@
     extraEnviron = { NIX_PATH="nixpkgs=${toString <nixpkgs>}"; };
   };
 
-  krebs.build.source.git.nixpkgs = {
+  krebs.build.source.nixpkgs = {
-    #url = https://github.com/nixos/nixpkgs;
+    # url = https://github.com/nixos/nixpkgs;
     # HTTP Everywhere + libredir
     rev = "8239ac6";
   };

2configs/backup.nix

@@ -0,0 +1,30 @@
+{ config, lib, ... }:
+with lib;
+let
+  startAt = "0,6,12,18:00";
+  defaultBackupServer = config.krebs.hosts.omo;
+  defaultBackupDir = "/home/backup";
+  defaultPull = host: src: {
+    method = "pull";
+    src = {
+      inherit host;
+      path = src;
+    };
+    dst = {
+      host = defaultBackupServer;
+      path = defaultBackupDir + src;
+    };
+    startAt = "0,6,12,18:00";
+    snapshots = {
+      hourly   = { format = "%Y-%m-%dT%H";    retain =  4; };
+      daily    = { format = "%Y-%m-%d";       retain =  7; };
+      weekly   = { format = "%YW%W";          retain =  4; };
+      monthly  = { format = "%Y-%m";          retain = 12; };
+      yearly   = { format = "%Y";                          };
+    };
+  };
+in {
+  krebs.backup.plans = addNames {
+    wry-to-omo_var-www = defaultPull wry "/var/www";
+  };
+}

2configs/default.nix

@@ -21,23 +21,17 @@ with lib;
       target = mkDefault "root@${config.krebs.build.host.name}";
       user = config.krebs.users.makefu;
       source =  {
-        git.nixpkgs = {
+        upstream-nixpkgs = {
-          #url = https://github.com/NixOS/nixpkgs;
           url = mkDefault https://github.com/nixos/nixpkgs;
           rev = mkDefault "93d8671e2c6d1d25f126ed30e5e6f16764330119"; # unstable @ 2015-01-03, tested on filepimp
-          target-path = "/var/src/nixpkgs";
         };
+        secrets = "/home/makefu/secrets/${config.krebs.build.host.name}/";
+        stockholm = "/home/makefu/stockholm";
 
-        dir.secrets = {
+        # Defaults for all stockholm users?
-          host = config.krebs.hosts.pornocauster;
+        nixos-config = "symlink:stockholm/${config.krebs.build.user.name}/1systems/${config.krebs.build.host.name}.nix";
-          path = "/home/makefu/secrets/${config.krebs.build.host.name}/";
+        nixpkgs = symlink:stockholm/nixpkgs;
-        };
+        stockholm-user = "symlink:stockholm/${config.krebs.build.user.name}";
-
-        dir.stockholm = {
-          host = config.krebs.hosts.pornocauster;
-          path = "/home/makefu/stockholm" ;
-          target-path = "/var/src/stockholm";
-        };
       };
     };
   };

2configs/unstable-sources.nix

@@ -1,7 +1,7 @@
 _:
 
 {
-  krebs.build.source.git.nixpkgs = {
+  krebs.build.source.nixpkgs = {
       url = https://github.com/makefu/nixpkgs;
       rev = "15b5bbfbd1c8a55e7d9e05dd9058dc102fac04fe"; # cherry-picked collectd
     };