X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=Makefile;h=fd358720952927114314b153cee7b26e9d7f5be6;hb=bbea22c02b6c059a6be1064391f06737ee244ba6;hp=d17ef1911f04d077646d576491eb77acec9fd854;hpb=af3aeef298d176c4f01ef341bf9662dd362834e5;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/Makefile b/Makefile
index d17ef19..fd35872 100644
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,10 @@
-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
+TARGET ?=
+MORPH_ARGS ?=
+SSHARGS ?=
+GEN ?=
 
-env-dry-run:
-	./scripts/make-env --dry-run
-
-nix-info:
-	@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-instantiate --find-file nixpkgs
-
-nix-info-nixops:
-	@$(MAKE) --no-print-directory -C nixops/ nix-info
+setup nix-info edit_env edit_vars ssh-eldiron ssh-backup-2 ssh-monitoring-1 ssh-4c debug build dry-run upload deploy next-boot deploy-reboot list-generations delete-generations cleanup:
+	@$(MAKE) --no-print-directory -C nixops/ $@
 
 nur:
 	./scripts/make-nur
@@ -35,4 +13,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 nur shellcheck
+.PHONY: nur shellcheck