fixup! secrets: add uploadAt option

DBCDK · Jul 19, 2021 · 7d9c7ee · 7d9c7ee
1 parent ff4e0cd
commit 7d9c7ee
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/morph.go b/morph.go
@@ -371,22 +371,22 @@ func execDeploy(hosts []nix.Host) (string, error) {
 			}
 		}
 
-		if doUploadSecrets {
-			phase := "post-activation"
-			err = execUploadSecrets(sshContext, singleHostInList, &phase)
+		if deployReboot {
+			err = host.Reboot(sshContext)
 			if err != nil {
+				fmt.Fprintln(os.Stderr, "Reboot failed")
 				return "", err
 			}
-
-			fmt.Fprintln(os.Stderr)
 		}
 
-		if deployReboot {
-			err = host.Reboot(sshContext)
+		if doUploadSecrets {
+			phase := "post-activation"
+			err = execUploadSecrets(sshContext, singleHostInList, &phase)
 			if err != nil {
-				fmt.Fprintln(os.Stderr, "Reboot failed")
 				return "", err
 			}
+
+			fmt.Fprintln(os.Stderr)
 		}
 
 		if !skipHealthChecks {