Use Makefile for some env/deploy scripts

1 files changed, 18 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 62a0f9d5..3ab58cf6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,17 @@
-subrecipes = setup ssh-eldiron info debug dry-run build upload deploy reboot push pull pull-deployment list-generations delete-generations cleanup
+subrecipes = setup
+subrecipes += nixops ssh-eldiron info debug dry-run build upload deploy deploy-reboot reboot
+subrecipes += list-generations delete-generations cleanup
+subrecipes += pull pull_environment pull_deployment deployment_is_set push push_deployment push_environment
 ${subrecipes}:
         @$(MAKE) --no-print-directory -C nixops/ $@
+.PHONY: ${subrecipes}
+
+# This will automatically upgrade to latest version at each build
+nixpkgs ?= https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz
+NIX_PATH = nixpkgs=${nixpkgs}:nixpkgsNext=${nixpkgs}:nixpkgsPrevious=${nixpkgs}
+
+nix-path:
+        @echo "export NIX_PATH=$(NIX_PATH)"
 
 env:
         ./scripts/make-env
@@ -9,10 +20,13 @@ env-dry-run:
         ./scripts/make-env --dry-run
 
 nix-info:
-        NIXOPS_DEPLOYMENT="" ./scripts/nix_infos
+        @version=$$(nix eval --raw nixpkgs.lib.version) && \
+          mainversion=$$(echo $$version | cut -d"." -f -2) && \
+          echo "https://releases.nixos.org/nixos/$$mainversion/nixos-$$version/nixexprs.tar.xz" && \
+          nix eval --raw nixpkgs.bc.meta.position | cut -d"/" -f-4
 
 nix-info-nixops:
-        NIXOPS_DEPLOYMENT="n" ./scripts/nix_infos
+        @$(MAKE) --no-print-directory -C nixops/ nix-info
 
 nur:
         ./scripts/make-nur
@@ -21,4 +35,4 @@ nur:
 shellcheck:
         shellcheck scripts/* nixops/scripts/* modules/private/gitolite/gitolite_ldap_groups.sh modules/private/ssh/ldap_authorized_keys.sh modules/private/pub/restrict
 
-.PHONY: env env-dry-run nix-info nix-info-nixops nur shellcheck
+.PHONY: env env-dry-run nix-info nur shellcheck