From c05db2409061f721ba454f4bf79e635ee13a6f11 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 7 Mar 2017 15:32:31 +0100
Subject: Revert "cd: hart eingeCACt"

This reverts commit 3607bd0832d0f47a4bf56cae7e4cb14f6e257bc9.
---
 krebs/3modules/tv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 1220143a7..d44c322aa 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -85,7 +85,7 @@ with import <stockholm/lib>;
       };
       nets = {
         internet = {
-          ip4.addr = "64.137.177.226";
+          ip4.addr = "45.62.237.203";
           aliases = [
             "cd.i"
             "cd.krebsco.de"
-- 
cgit v1.2.3


From 5fe56a99b806335698354c2c6c5a6cd9c3f28749 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 7 Mar 2017 19:25:03 +0100
Subject: k 3 monit: allow path or str for alarms & test

---
 krebs/3modules/monit.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/monit.nix b/krebs/3modules/monit.nix
index 4d4066ae4..cc4a1b208 100644
--- a/krebs/3modules/monit.nix
+++ b/krebs/3modules/monit.nix
@@ -49,10 +49,10 @@ let
       type = with types; attrsOf (submodule {
         options = {
           test = mkOption {
-            type = path;
+            type = either path str;
           };
           alarm = mkOption {
-            type = path;
+            type = either path str;
           };
           interval = mkOption {
             type = str;
-- 
cgit v1.2.3


From 8464ebbf6954a5940b9dce8927639e128434b9d7 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Wed, 8 Mar 2017 00:47:43 +0100
Subject: k 3 repo-sync: better types, add repo timer

---
 krebs/3modules/repo-sync.nix | 114 +++++++++++++++++++++++++++----------------
 1 file changed, 71 insertions(+), 43 deletions(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/repo-sync.nix b/krebs/3modules/repo-sync.nix
index 7705635f0..0211b31ba 100644
--- a/krebs/3modules/repo-sync.nix
+++ b/krebs/3modules/repo-sync.nix
@@ -12,7 +12,34 @@ let
   api = {
     enable = mkEnableOption "repo-sync";
     repos = mkOption {
-      type = with types;attrsOf (attrsOf (attrsOf (attrsOf str)));
+      type = types.attrsOf (types.submodule {
+        options = {
+          branches = mkOption {
+            type = types.attrsOf (types.submodule ({ config, ... }: {
+              options = {
+                origin = mkOption {
+                  type = types.git-source;
+                };
+                mirror = mkOption {
+                  type = types.git-source;
+                };
+              };
+              config = {
+                origin.ref = mkDefault "heads/master";
+                mirror.ref = mkDefault "heads/${config._module.args.name}";
+              };
+            }));
+          };
+          latest = mkOption {
+            type = types.nullOr types.git-source;
+            default = null;
+          };
+          timerConfig = mkOption {
+            type = types.attrsOf types.str;
+            default = cfg.timerConfig;
+          };
+        };
+      });
       example = literalExample ''
         # see `repo-sync --help`
         #   `ref` provides sane defaults and can be omitted
@@ -23,53 +50,53 @@ let
         # each attrset defines a group of repos for syncing
 
         { nxpkgs = {
-            makefu = {
-              origin = {
-                url = http://github.com/makefu/nixpkgs;
-                ref = "heads/dev" ;
+            branches = {
+              makefu = {
+                origin = {
+                  url = http://github.com/makefu/nixpkgs;
+                  ref = "heads/dev" ;
+                };
+                mirror = {
+                  url = "git@internal:nixpkgs-mirror" ;
+                  ref = "heads/github-mirror-dev" ;
+                };
               };
-              mirror = {
-                url = "git@internal:nixpkgs-mirror" ;
-                ref = "heads/github-mirror-dev" ;
+              lass = {
+                origin = {
+                  url = http://github.com/lass/nixpkgs;
+                };
+                mirror = {
+                  url = "git@internal:nixpkgs-mirror" ;
+                };
               };
             };
-            lass = {
-              origin = {
-                url = http://github.com/lass/nixpkgs;
-              };
-              mirror = {
-                url = "git@internal:nixpkgs-mirror" ;
-              };
-            };
-            "@latest" = {
-              mirror = {
-                url = "git@internal:nixpkgs-mirror";
-                ref = "heads/master";
-              };
+            latest = {
+              url = "git@internal:nixpkgs-mirror";
+              ref = "heads/master";
             };
           };
           stockholm = {
-            lass = {
-              origin = {
-                url = http://cgit.prism.r/stockholm;
+            branches = {
+              lass = {
+                origin = {
+                  url = http://cgit.prism.r/stockholm;
+                };
+                mirror = {
+                  url = "git@internal:stockholm-mirror" ;
+                };
               };
-              mirror = {
-                url = "git@internal:stockholm-mirror" ;
+              makefu = {
+                origin = {
+                  url = http://gum.krebsco.de/stockholm;
+                };
+                mirror = {
+                  url = "git@internal:stockholm-mirror" ;
+                };
               };
             };
-            makefu = {
-              origin = {
-                url = http://gum.krebsco.de/stockholm;
-              };
-              mirror = {
-                url = "git@internal:stockholm-mirror" ;
-              };
-            };
-            "@latest" = {
-              mirror = {
-                url = "git@internal:stockholm-mirror";
-                ref = "heads/master";
-              };
+            latest = {
+              url = "git@internal:stockholm-mirror";
+              ref = "heads/master";
             };
           };
         };
@@ -127,15 +154,16 @@ let
       nameValuePair "repo-sync-${name}" {
         description = "repo-sync timer";
         wantedBy = [ "timers.target" ];
-
-        timerConfig = cfg.timerConfig;
+        timerConfig = repo.timerConfig;
       }
     ) cfg.repos;
 
     systemd.services = mapAttrs' (name: repo:
       let
-        repo-sync-config = pkgs.writeText "repo-sync-config-${name}.json"
-          (builtins.toJSON repo);
+        repo-sync-config = pkgs.writeJSON "repo-sync-config-${name}.json"
+          (repo.branches // optionalAttrs (repo.latest != null) {
+            "@latest".mirror = repo.latest;
+          });
       in nameValuePair "repo-sync-${name}" {
         description = "repo-sync";
         after = [ "network.target" "secret.service" ];
-- 
cgit v1.2.3