From 3a3e168c8a5731038a7fd05808f7ebdf73b1abe8 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 14 Feb 2018 23:27:37 +0100
Subject: tv gitrepos: drop redundant fetch permissions

Everybody already has permission to fetch via HTTP.
---
 tv/2configs/gitrepos.nix | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'tv')

diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index 2c4b4868e..dc50be4f1 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -128,11 +128,6 @@ let {
         repo = [ repo ];
         perm = push "refs/*" [ non-fast-forward create delete merge ];
       } ++
-      optional repo.public {
-        user = attrValues config.krebs.users;
-        repo = [ repo ];
-        perm = fetch;
-      } ++
       optional (repo.collaborators or [] != []) {
         user = repo.collaborators;
         repo = [ repo ];
-- 
cgit v1.2.3


From 67969d72e137a65adba775c6219eb85ae72ccc77 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 28 Feb 2018 14:47:12 +0100
Subject: os-release: use <stockholm-version>

---
 tv/source.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'tv')

diff --git a/tv/source.nix b/tv/source.nix
index b5e3f7cd7..e5e5e0413 100644
--- a/tv/source.nix
+++ b/tv/source.nix
@@ -6,6 +6,11 @@ with import <stockholm/lib>;
 }@host: let
   builder = if dummy_secrets then "buildbot" else "tv";
   _file = <stockholm> + "/tv/1systems/${name}/source.nix";
+  pkgs = import <nixpkgs> {
+    overlays = map import [
+      <stockholm/krebs/5pkgs>
+    ];
+  };
 in
   evalSource (toString _file) [
     {
@@ -20,6 +25,7 @@ in
         tv = "/home/tv/secrets/${name}";
       };
       stockholm.file = toString <stockholm>;
+      stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version";
     }
     (mkIf (builder == "tv") {
       secrets-common.file = "/home/tv/secrets/common";
-- 
cgit v1.2.3


From 2934d4524bcbae13043d684a27597c8b08c0851b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 28 Feb 2018 22:38:42 +0100
Subject: tv gitrepos: add kops

---
 tv/2configs/gitrepos.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tv')

diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index dc50be4f1..c3418e7ee 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -42,6 +42,9 @@ let {
     kirk = {
       cgit.desc = "IRC tools";
     };
+    kops = {
+      cgit.desc = "deployment tools";
+    };
     load-env = {};
     loldns = {
       cgit.desc = "toy DNS server";
-- 
cgit v1.2.3