aboutsummaryrefslogtreecommitdiff
path: root/nixops
diff options
context:
space:
mode:
Diffstat (limited to 'nixops')
-rw-r--r--nixops/default.nix (renamed from nixops/eldiron.nix)0
-rwxr-xr-xnixops/scripts/nixops_wrap2
-rwxr-xr-xnixops/scripts/pull_deployment2
-rwxr-xr-xnixops/scripts/push_deployment2
-rwxr-xr-xnixops/scripts/setup6
5 files changed, 6 insertions, 6 deletions
diff --git a/nixops/eldiron.nix b/nixops/default.nix
index 649e431..649e431 100644
--- a/nixops/eldiron.nix
+++ b/nixops/default.nix
diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index e75fa2f..28aa917 100755
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -8,7 +8,7 @@ fi
8DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" 8DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
9export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" 9export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
10export NIXOPS_DEPLOYMENT="$DeploymentUuid" 10export NIXOPS_DEPLOYMENT="$DeploymentUuid"
11source $(dirname $(dirname $DIR))/nix_path_env 11source $(dirname $(dirname $DIR))/scripts/nix_env
12 12
13TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files) 13TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files)
14chmod go-rwx $TEMP 14chmod go-rwx $TEMP
diff --git a/nixops/scripts/pull_deployment b/nixops/scripts/pull_deployment
index ef0f221..2f50875 100755
--- a/nixops/scripts/pull_deployment
+++ b/nixops/scripts/pull_deployment
@@ -8,7 +8,7 @@ fi
8DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" 8DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
9export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" 9export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
10export NIXOPS_DEPLOYMENT="$DeploymentUuid" 10export NIXOPS_DEPLOYMENT="$DeploymentUuid"
11source $(dirname $(dirname $DIR))/nix_path_env 11source $(dirname $(dirname $DIR))/scripts/nix_env
12 12
13export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" 13export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
14 14
diff --git a/nixops/scripts/push_deployment b/nixops/scripts/push_deployment
index 26f8cd2..f2d25f9 100755
--- a/nixops/scripts/push_deployment
+++ b/nixops/scripts/push_deployment
@@ -8,6 +8,6 @@ fi
8DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" 8DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
9export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" 9export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
10export NIXOPS_DEPLOYMENT="$DeploymentUuid" 10export NIXOPS_DEPLOYMENT="$DeploymentUuid"
11source $(dirname $(dirname $DIR))/nix_path_env 11source $(dirname $(dirname $DIR))/scripts/nix_env
12 12
13nixops_custom export | pass insert -m $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment 13nixops_custom export | pass insert -m $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment
diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 72b19c0..cc03482 100755
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -94,7 +94,7 @@ if nix show-config --json | jq -e '.sandbox.value == "true"' >/dev/null; then
94fi 94fi
95 95
96DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" 96DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
97source $(dirname $(dirname $DIR))/nix_path_env 97source $(dirname $(dirname $DIR))/scripts/nix_env
98export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" 98export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
99export NIXOPS_DEPLOYMENT="$DeploymentUuid" 99export NIXOPS_DEPLOYMENT="$DeploymentUuid"
100 100
@@ -107,14 +107,14 @@ if ! nixops_custom info 2>/dev/null >/dev/null; then
107 if [ "$y" = "y" -o "$y" = "Y" ]; then 107 if [ "$y" = "y" -o "$y" = "Y" ]; then
108 deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment) 108 deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment)
109 echo "$deployment" | nixops_custom import 109 echo "$deployment" | nixops_custom import
110
111 nixops_custom modify "$(dirname $DIR)/eldiron.nix"
112 else 110 else
113 echo "Aborting" 111 echo "Aborting"
114 exit 1 112 exit 1
115 fi 113 fi
116fi 114fi
117 115
116nixops_custom modify "$(dirname $DIR)/default.nix"
117
118cat <<-EOF 118cat <<-EOF
119 All set up. 119 All set up.
120 Please make sure you’re using scripts/nixops_wrap when deploying 120 Please make sure you’re using scripts/nixops_wrap when deploying