summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-06-24 20:49:39 +0200
committertv <tv@shackspace.de>2015-06-24 20:49:39 +0200
commit42a0fd4e6501af08ea3880ca549b18dffa26a9bd (patch)
tree581c3caefd8f9885d51a003df6348017999b2213
parentaaa777168e84458121f9d228b29ecd0e06e8fbf9 (diff)
... and it's not called "new-"nixos-build^_^
-rwxr-xr-xbin/copy-secrets8
-rwxr-xr-xbin/nixos-build4
-rwxr-xr-xinfest-cac-CentOS-7-64bit.sh4
3 files changed, 8 insertions, 8 deletions
diff --git a/bin/copy-secrets b/bin/copy-secrets
index 27b41bdc4..74b9301a6 100755
--- a/bin/copy-secrets
+++ b/bin/copy-secrets
@@ -22,11 +22,11 @@ NIX_PATH=$NIX_PATH:nixos-config=$PWD/modules/$system_name
NIX_PATH=$NIX_PATH:secrets=$PWD/secrets/$system_name/nix
export NIX_PATH
-retiolum_secret=$(new-nixos-query tv.retiolum.privateKeyFile)
-retiolum_uid=$(new-nixos-query users.extraUsers.retiolum-tinc.uid)
+retiolum_secret=$(nixos-query tv.retiolum.privateKeyFile)
+retiolum_uid=$(nixos-query users.extraUsers.retiolum-tinc.uid)
-ejabberd_secret=$(new-nixos-query services.ejabberd-cd.certFile)
-ejabberd_uid=$(new-nixos-query users.extraUsers.ejabberd.uid)
+ejabberd_secret=$(nixos-query services.ejabberd-cd.certFile)
+ejabberd_uid=$(nixos-query users.extraUsers.ejabberd.uid)
(set -x
rsync \
diff --git a/bin/nixos-build b/bin/nixos-build
index 94f3dc1f4..200f99e4a 100755
--- a/bin/nixos-build
+++ b/bin/nixos-build
@@ -21,8 +21,8 @@ secrets_rsync=$secrets_root/$host/rsync
NIX_PATH=$NIX_PATH:secrets=$secrets_nix
export NIX_PATH
- rev=$(new-nixos-query nixpkgs.rev)
- url=$(new-nixos-query nixpkgs.url)
+ rev=$(nixos-query nixpkgs.rev)
+ url=$(nixos-query nixpkgs.url)
fetchgit "$rev" "$url" tmp/nixpkgs/$host
)
diff --git a/infest-cac-CentOS-7-64bit.sh b/infest-cac-CentOS-7-64bit.sh
index 6cc39440a..207c403de 100755
--- a/infest-cac-CentOS-7-64bit.sh
+++ b/infest-cac-CentOS-7-64bit.sh
@@ -14,8 +14,8 @@ systemname=$2
NIX_PATH=$NIX_PATH:secrets=$PWD/secrets/$systemname/nix
export NIX_PATH
- rev=$(new-nixos-query nixpkgs.rev)
- url=$(new-nixos-query nixpkgs.url)
+ rev=$(nixos-query nixpkgs.rev)
+ url=$(nixos-query nixpkgs.url)
fetchgit "$rev" "$url" tmp/nixpkgs/$systemname
)