From f8b1e849a6a3bd53f24a4aac70bc904cdb5ff711 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 21 May 2015 23:52:06 +0200
Subject: deploy: merge next

---
 next/bin/build        | 22 ----------------------
 next/bin/copy-secrets | 28 ----------------------------
 next/bin/deploy       | 16 ----------------
 next/bin/query        | 20 --------------------
 next/profile          | 11 -----------
 5 files changed, 97 deletions(-)
 delete mode 100755 next/bin/build
 delete mode 100755 next/bin/copy-secrets
 delete mode 100755 next/bin/deploy
 delete mode 100755 next/bin/query
 delete mode 100755 next/profile

(limited to 'next')

diff --git a/next/bin/build b/next/bin/build
deleted file mode 100755
index 40bbec344..000000000
--- a/next/bin/build
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-#
-# build : hostname -> system-path
-#
-set -euf
-
-host=$1
-
-#target=root@$host
-
-nixos_config=$config_root/modules/$host
-secrets_nix=$secrets_root/$host/nix
-secrets_rsync=$secrets_root/$host/rsync
-
-nix-build \
-    -I "$nixpkgs" \
-    -I nixos-config="$nixos_config" \
-    -I retiolum-hosts="$retiolum_hosts" \
-    -I secrets="$secrets_nix" \
-    -A system \
-    --no-out-link \
-    '<nixos>'
diff --git a/next/bin/copy-secrets b/next/bin/copy-secrets
deleted file mode 100755
index 7398d4fb1..000000000
--- a/next/bin/copy-secrets
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-set -euf
-
-host=$1
-
-target=root@$host
-
-nixos_config=$config_root/modules/$host
-secrets_nix=$secrets_root/$host/nix
-secrets_rsync=$secrets_root/$host/rsync
-
-if ! test -e "$secrets_rsync"; then
-  exit # nothing to do
-fi
-
-retiolum_secret=$(query $host services.retiolum.privateKeyFile)
-retiolum_uid=$(query $host users.extraUsers.retiolum-tinc.uid)
-
-ejabberd_secret=/etc/ejabberd/ejabberd.pem
-ejabberd_uid=$(query $host users.extraUsers.ejabberd.uid)
-
-rsync -cz --chown=0:0 -vr "$secrets_rsync/" "$target:/"
-
-ssh "$target" -T <<EOF
-set -euf
-! test -f $retiolum_secret || chown -v $retiolum_uid:0 $retiolum_secret
-! test -f $ejabberd_secret || chown -v $ejabberd_uid:0 $ejabberd_secret
-EOF
diff --git a/next/bin/deploy b/next/bin/deploy
deleted file mode 100755
index 1c1d977da..000000000
--- a/next/bin/deploy
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-#
-# deploy
-#
-set -euf
-
-host=$1
-system=${2-$(build "$host")}
-
-target=root@$host
-
-nix-copy-closure --gzip --to "$target" "$system"
-
-copy-secrets "$host"
-
-ssh ${NIX_SSHOPTS-} "$target" "$system/bin/switch-to-configuration" switch
diff --git a/next/bin/query b/next/bin/query
deleted file mode 100755
index 0e55a6cec..000000000
--- a/next/bin/query
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-set -euf
-
-host=$1
-attr=$2
-
-nixos_config=$config_root/modules/$host
-secrets_nix=$secrets_root/$host/nix
-secrets_rsync=$secrets_root/$host/rsync
-
-nix-instantiate \
-    -I "$nixpkgs" \
-    -I nixos-config="$nixos_config" \
-    -I retiolum-hosts="$retiolum_hosts" \
-    -I secrets="$secrets_nix" \
-    -A config."$attr" \
-    '<nixos>' \
-    --eval \
-    --json \
-  | jq -r .
diff --git a/next/profile b/next/profile
deleted file mode 100755
index 138c271f7..000000000
--- a/next/profile
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-export PATH=$HOME/src/config/next/bin:$PATH
-export nixpkgs=/var/nixpkgs
-export config_root=$HOME/src/config
-export retiolum_hosts=$HOME/src/config/hosts
-export secrets_root=$HOME/src/config/secrets
-
-export PS1='\[\e[1;35m\]config>\[\e[m\] '
-
-cd /var/empty
-exec /bin/sh
-- 
cgit v1.2.3