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

---
 deploy | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'deploy')

diff --git a/deploy b/deploy
index 43021d545..6034196e1 100755
--- a/deploy
+++ b/deploy
@@ -1,16 +1,16 @@
 #! /bin/sh
 #
-# usage: ./deploy HOST [[USER@]HOST]
+# usage: ./deploy HOST
 #
 set -euf
 
-PATH="$PWD/bin${PATH+:$PATH}"
-export PATH
-
-user=root
 host=$1
 
-config=./modules/$host/default.nix
-target=${2-$user@$host}
+export PATH="$PWD/bin:$PATH"
+#export nixpkgs=/var/nixpkgs
+export nixpkgs_root=$PWD/tmp/nixpkgs
+export config_root=$PWD
+export retiolum_hosts=$PWD/hosts
+export secrets_root=$PWD/secrets
 
-exec ssh-deploy "$config" "$target"
+exec nixos-deploy "$host"
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/b8100000.lock: No such file or directory (2)