From bb201b19659b1da47f212d3b74cd18da543e8d6e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 19 Feb 2016 16:37:25 +0100
Subject: push: 1.1.1 -> 1.1.2

---
 krebs/5pkgs/push/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/push/default.nix b/krebs/5pkgs/push/default.nix
index 13769c74..aa17a21a 100644
--- a/krebs/5pkgs/push/default.nix
+++ b/krebs/5pkgs/push/default.nix
@@ -1,20 +1,21 @@
 { fetchgit, lib, stdenv
 , coreutils
-, get
 , git
+, gnumake
 , gnused
 , jq
+, nix
 , openssh
 , parallel
 , ... }:
 
 stdenv.mkDerivation {
-  name = "push-1.1.1";
+  name = "push-1.1.2";
 
   src = fetchgit {
     url = http://cgit.cd.krebsco.de/push;
-    rev = "ea8b76569c6b226fe148e559477669b095408472";
-    sha256 = "c305a1515d30603f6ed825d44487e863fdc7d90400620ceaf2c335a3b5d1e221";
+    rev = "da5b3a4b05ef822cc41d36b6cc2071a2e78506d4";
+    sha256 = "0gfxz207lm11g77rw02jcqpvzhx07j9hzgjgscbmslzl5r8icd6g";
   };
 
   phases = [
@@ -26,10 +27,11 @@ stdenv.mkDerivation {
     let
       path = lib.makeSearchPath "bin" [
         coreutils
-        get
         git
+        gnumake
         gnused
         jq
+        nix
         openssh
         parallel
       ];
-- 
cgit v1.2.3


From 2ff36bad032df0900e13a3ec743b09064c3d07c6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 19 Feb 2016 18:56:01 +0100
Subject: test infest-cac-centos7: use make install interface

---
 krebs/5pkgs/test/infest-cac-centos7/notes | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/test/infest-cac-centos7/notes b/krebs/5pkgs/test/infest-cac-centos7/notes
index db80c0c6..6bb0258a 100755
--- a/krebs/5pkgs/test/infest-cac-centos7/notes
+++ b/krebs/5pkgs/test/infest-cac-centos7/notes
@@ -1,4 +1,4 @@
-# nix-shell -p gnumake jq openssh cac-api cac-panel
+# nix-shell -p gnumake jq openssh cac-api cac-panel sshpass
 set -eufx
 
 # 2 secrets are required:
@@ -99,7 +99,7 @@ defer "cac-api delete $id;$old_trapstr"
 mkdir -p shared/2configs/temp
 cac-api generatenetworking $id > \
   shared/2configs/temp/networking.nix
-# new temporary ssh key we will use to log in after infest
+# new temporary ssh key we will use to log in after install
 ssh-keygen -f $krebs_ssh -N ""
 cp $retiolum_key $krebs_secrets/retiolum.rsa_key.priv
 # we override the directories for secrets and stockholm
@@ -118,12 +118,12 @@ _: {
 }
 EOF
 
-LOGNAME=shared make eval get=krebs.infest \
-  target=derp system=test-centos7 filter=json \
-  | sed -e "s#^ssh.*<<#cac-api ssh $id<<#" \
-        -e "/^rsync/a -e 'cac-api ssh $id' \\\\"  \
-        -e "s#root.derp:#:#" > $krebs_secrets/infest
-sh -x $krebs_secrets/infest
+make install \
+    LOGNAME=shared \
+    SSHPASS="$(cac-api getserver $id | jq -r .rootpass)" \
+    ssh='sshpass -e ssh -S none -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' \
+    system=test-centos7 \
+    target=$ip
 
 # TODO: generate secrets directory $krebs_secrets for nix import
 cac-api powerop $id reset
-- 
cgit v1.2.3


From 937641b6139973339eebc88a475b3b895c9aa701 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 22 Feb 2016 11:33:51 +0100
Subject: cac-api: 1.1.0 -> 1.1.1

---
 krebs/5pkgs/cac-api/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/cac-api/default.nix b/krebs/5pkgs/cac-api/default.nix
index 30c0168f..a57e730d 100644
--- a/krebs/5pkgs/cac-api/default.nix
+++ b/krebs/5pkgs/cac-api/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, bc, cac-cert, coreutils, curl, dash, gnugrep, gnused, inotifyTools, jq, ncurses, openssh, sshpass, ... }:
 
 stdenv.mkDerivation {
-  name = "cac-api-1.1.0";
+  name = "cac-api-1.1.1";
 
   src = fetchgit {
     url = http://cgit.cd.krebsco.de/cac-api;
-    rev = "0809fae379239687ed1170e04311dc2880ef0aba";
-    sha256 = "357ced27c9ed88028967c934178a1d230bf38617a7494cd4632fabdd2a04fcdd";
+    rev = "46c7af2935ccc096ba0e93cd1adf575026edf44a";
+    sha256 = "0i8aspkmfw74np7hlbip3hk7zbgl6cxrnbg83x4wgqrj5dpx6vy0";
   };
 
   phases = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
       ncurses
       openssh
       sshpass
-    ]}
+    ]}:"$PATH"
     EOF
       # [1]: Disable fetching tasks; listtasks is currently broken:
       # Unknown column 'iod.apitask.cid' in 'field list'
-- 
cgit v1.2.3


From 8393444dce1888d369955e46dd16983a43762bb9 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 22 Feb 2016 13:24:03 +0100
Subject: cac-api: 1.1.1 -> 1.1.2

---
 krebs/5pkgs/cac-api/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/cac-api/default.nix b/krebs/5pkgs/cac-api/default.nix
index a57e730d..52ada4f1 100644
--- a/krebs/5pkgs/cac-api/default.nix
+++ b/krebs/5pkgs/cac-api/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, bc, cac-cert, coreutils, curl, dash, gnugrep, gnused, inotifyTools, jq, ncurses, openssh, sshpass, ... }:
 
 stdenv.mkDerivation {
-  name = "cac-api-1.1.1";
+  name = "cac-api-1.1.2";
 
   src = fetchgit {
     url = http://cgit.cd.krebsco.de/cac-api;
-    rev = "46c7af2935ccc096ba0e93cd1adf575026edf44a";
-    sha256 = "0i8aspkmfw74np7hlbip3hk7zbgl6cxrnbg83x4wgqrj5dpx6vy0";
+    rev = "67e93510e7742acae44db30275abbfe671aa9b7b";
+    sha256 = "1vxh57j7vrq5sg9j1sam0538kkkhqpgf230vvdz2ifzgkj01z27l";
   };
 
   phases = [
-- 
cgit v1.2.3