From fdf6f74d3221e3dad853898f296149baea0aa476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 2 May 2019 12:01:33 +0200 Subject: Refactor configuration and overlays --- nixops/scripts/nixops_wrap | 2 +- nixops/scripts/pull_deployment | 2 +- nixops/scripts/push_deployment | 2 +- nixops/scripts/setup | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'nixops/scripts') diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap index 12f661a..d03784e 100755 --- a/nixops/scripts/nixops_wrap +++ b/nixops/scripts/nixops_wrap @@ -9,7 +9,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" export NIXOPS_DEPLOYMENT="$DeploymentUuid" source $(dirname $(dirname $DIR))/nix_path_env -nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops" +nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixops" TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files) chmod go-rwx $TEMP diff --git a/nixops/scripts/pull_deployment b/nixops/scripts/pull_deployment index bc4a999..10f71fe 100755 --- a/nixops/scripts/pull_deployment +++ b/nixops/scripts/pull_deployment @@ -9,7 +9,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" export NIXOPS_DEPLOYMENT="$DeploymentUuid" source $(dirname $(dirname $DIR))/nix_path_env -nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops" +nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixops" export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" diff --git a/nixops/scripts/push_deployment b/nixops/scripts/push_deployment index 067b665..6c67fab 100755 --- a/nixops/scripts/push_deployment +++ b/nixops/scripts/push_deployment @@ -9,6 +9,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" export NIXOPS_DEPLOYMENT="$DeploymentUuid" source $(dirname $(dirname $DIR))/nix_path_env -nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops" +nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixops" $nixops export | pass insert -m $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment diff --git a/nixops/scripts/setup b/nixops/scripts/setup index 55dd9d9..1586265 100755 --- a/nixops/scripts/setup +++ b/nixops/scripts/setup @@ -136,7 +136,7 @@ fi DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source $(dirname $(dirname $DIR))/nix_path_env -nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops" +nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixops" export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" export NIXOPS_DEPLOYMENT="$DeploymentUuid" -- cgit v1.2.3