diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-22 01:08:46 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-22 01:08:46 +0100 |
| commit | 020fcc22000ce35337a765bfa37f4178fbbff68c (patch) | |
| tree | 8485531b5285b4dce6e9b9abecba4ccad5b9b46a /krebs/5pkgs/test | |
| parent | 2924afb8a2cb7d734b56a4a8934737129a20154c (diff) | |
| parent | a2b8eb75506fa27bc3d44f6a33d860ce7d3470e0 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/5pkgs/test')
| -rwxr-xr-x | krebs/5pkgs/test/infest-cac-centos7/notes | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/krebs/5pkgs/test/infest-cac-centos7/notes b/krebs/5pkgs/test/infest-cac-centos7/notes index db80c0c6c..6bb0258a9 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 |