From c989fbe2c7fefb52835418874e0f05e1d9e40c0c Mon Sep 17 00:00:00 2001 From: zimbatm <zimbatm@zimbatm.com> Date: Sun, 12 Jan 2020 14:03:14 +0100 Subject: [PATCH] nixos: set default deployment and state in the shell This makes it easier to play with nixops. Eg: `nixops ssh build01` --- deploy | 10 ++++------ shell.nix | 4 +++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deploy b/deploy index e931ca1..166c41a 100755 --- a/deploy +++ b/deploy @@ -2,12 +2,10 @@ #! nix-shell ./shell.nix -i bash set -euo pipefail -DEPLOYMENT_NAME="nix-community-infra" -STATE_FILE="./state/deployment-state.nixops" - mkdir -p state -if [ $(nixops list --state $STATE_FILE | grep -c $DEPLOYMENT_NAME) -eq 0 ]; then - nixops create ./deployment.nix --deployment $DEPLOYMENT_NAME --state $STATE_FILE + +if [ $(nixops list --state "$NIXOPS_STATE" | grep -c "$NIXOPS_DEPLOYMENT") -eq 0 ]; then + nixops create ./deployment.nix --deployment "$NIXOPS_DEPLOYMENT" --state "$NIXOPS_STATE" fi -nixops deploy -d $DEPLOYMENT_NAME --state $STATE_FILE "$@" +nixops deploy "$@" diff --git a/shell.nix b/shell.nix index 6fa1a96..feef5e2 100644 --- a/shell.nix +++ b/shell.nix @@ -10,9 +10,11 @@ in pkgs.mkShell { NIX_PATH="nixpkgs=${toString pkgs.path}"; + NIXOPS_DEPLOYMENT="nix-community-infra"; + NIXOPS_STATE="./state/deployment-state.nixops"; + buildInputs = [ pkgs.git-crypt pkgs.nixops ]; - }