X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2FMakefile;h=11c5a0f5c4548e7cc4e60e1acc44bfc532e3a481;hb=c7b16397101fd534c41ede5ae7c55e7e120c06f7;hpb=47f8078d0e62a026bab77a93a0e9672f44738502;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/Makefile b/nixops/Makefile
index fb9da4c..11c5a0f 100644
--- a/nixops/Makefile
+++ b/nixops/Makefile
@@ -18,6 +18,8 @@ setup:
 ###### Morph regular tasks
 PROFILE=/nix/var/nix/profiles/per-user/immae/morph/immaeEu
 TARGET ?=
+COMMON_COLEMNA_ARGS = -v
+#Only enabled in colemna 0.4: --nix-option allow-unsafe-native-code-during-evaluation true --nix-option allow-import-from-derivation true --nix-option substituters https://cache.nixos.org/
 MORPH_ARGS ?=
 ifdef TARGET
   # multiple targets: --on="{machine1,machine2}" (works with * glob too)
@@ -51,27 +53,27 @@ ssh-4c:
 	./scripts/with_env bash -c 'ssh -i $$SSH_IDENTITY_FILE root@quatresaisons $(SSH_ARGS)'
 
 debug:
-	./scripts/with_env morph build --show-trace default.nix $(MORPH_ARGS)
+	./scripts/with_env colmena build $(COMMON_COLEMNA_ARGS) --show-trace -f default.nix $(MORPH_ARGS)
 
 build:
-	./scripts/with_env morph build default.nix $(MORPH_ARGS)
+	./scripts/with_env colmena build $(COMMON_COLEMNA_ARGS) -f default.nix $(MORPH_ARGS)
 
-dry-run:
-	./scripts/with_env morph build --dry-run default.nix $(MORPH_ARGS)
+#dry-run:
+#	./scripts/with_env morph build -v --dry-run default.nix $(MORPH_ARGS)
 
 upload:
-	./scripts/with_env morph push default.nix $(MORPH_ARGS)
+	./scripts/with_env colmena apply $(COMMON_COLEMNA_ARGS) push -f default.nix $(MORPH_ARGS)
 
 deploy:
-	./scripts/with_env morph deploy default.nix switch --keep-result --upload-secrets $(MORPH_ARGS)
+	./scripts/with_env colmena apply $(COMMON_COLEMNA_ARGS) switch -f default.nix --keep-result $(MORPH_ARGS)
 	nix-env -p $(PROFILE) --set .gcroots/default.nix
 
 next-boot:
-	./scripts/with_env morph deploy default.nix boot --keep-result --upload-secrets $(MORPH_ARGS)
+	./scripts/with_env colmena apply -v boot -f default.nix --keep-result $(MORPH_ARGS)
 	nix-env -p $(PROFILE) --set .gcroots/default.nix
 
 deploy-reboot:
-	./scripts/with_env morph deploy default.nix boot --reboot --upload-secrets $(MORPH_ARGS)
+	./scripts/with_env colmena apply $(COMMON_COLEMNA_ARGS) boot -f default.nix --reboot $(MORPH_ARGS)
 
 .PHONY: ssh-eldiron ssh-dilion ssh-monitoring-1 ssh-backup-2 debug build upload deploy deploy-reboot