iog master diff

Cargo.toml

@@ -6,15 +6,15 @@
 name = "deploy-rs"
 version = "0.1.0"
 authors = ["notgne2 <[email protected]>", "Serokell <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "3.0.0-beta.2"
+clap = { version = "3.0.0-rc.3", features = [ "derive", "env" ] }
 flexi_logger = "0.16"
-fork = "0.1"
 futures-util = "0.3.6"
+linked_hash_set = "0.1.4"
 log = "0.4"
 merge = "0.1.0"
 notify = "5.0.0-pre.3"
@@ -27,6 +27,7 @@ tokio = { version = "1.9.0", features = [ "full" ] }
 toml = "0.5"
 whoami = "0.9.0"
 yn = "0.1"
+envmnt = "0.9.0"
 
 # smol_str is required by rnix, but 0.1.17 doesn't build on rustc
 # 1.45.2 (shipped in nixos-20.09); it requires rustc 1.46.0. See
@@ -37,3 +38,7 @@ smol_str = "=0.1.16"
 [lib]
 name = "deploy"
 path = "src/lib.rs"
+
+[profile.release]
+lto = "thin"
+opt-level = 3

README.md

@@ -30,7 +30,7 @@ You can try out this tool easily with `nix run`:
 
 In you want to deploy multiple flakes or a subset of profiles with one invocation, instead of calling `deploy <flake>` you can issue `deploy --targets <flake> [<flake> ...]` where `<flake>` is supposed to take the same format as discussed before.
 
-Running in this mode, if any of the deploys fails, the deploy will be aborted and all successful deploys rolled back. `--rollback-succeeded false` can be used to override this behavior, otherwise the `auto-rollback` argument takes precedent.
+Running in this mode, if any of the deploys fails, the deploy will be aborted and all successful deploys rolled back. `--rollback-succeeded false` can be used to override this behavior, otherwise the `no-auto-rollback` argument takes precedent.
 
 If you require a signing key to push closures to your server, specify the path to it in the `LOCAL_KEY` environment variable.
 
@@ -48,7 +48,7 @@ This type of design (as opposed to more traditional tools like NixOps or morph)
 
 ### Magic Rollback
 
-There is a built-in feature to prevent you making changes that might render your machine unconnectable or unusuable, which works by connecting to the machine after profile activation to confirm the machine is still available, and instructing the target node to automatically roll back if it is not confirmed. If you do not disable `magicRollback` in your configuration (see later sections) or with the CLI flag, you will be unable to make changes to the system which will affect you connecting to it (changing SSH port, changing your IP, etc).
+There is a built-in feature to prevent you making changes that might render your machine unconnectable or unusuable, which works by connecting to the machine after profile activation to confirm the machine is still available, and instructing the target node to automatically roll back if it is not confirmed. If you do not disable `noMagicRollback` in your configuration (see later sections) or with the CLI flag, you will be unable to make changes to the system which will affect you connecting to it (changing SSH port, changing your IP, etc).
 
 ## API
 
@@ -166,17 +166,15 @@ This is a set of options that can be put in any of the above definitions, with t
   # This defaults to `false`
   fastConnection = false;
 
-  # If the previous profile should be re-activated if activation fails.
-  # This defaults to `true`
-  autoRollback = true;
+  # If the previous profile should NOT be re-activated if activation fails.
+  noAutoRollback = true;
 
-  # See the earlier section about Magic Rollback for more information.
-  # This defaults to `true`
-  magicRollback = true;
+  # See the earlier section about Magic Rollback for more information, disable with this attr.
+  noMagicRollback = true;
 
-  # The path which deploy-rs will use for temporary files, this is currently only used by `magicRollback` to create an inotify watcher in for confirmations
+  # The path which deploy-rs will use for temporary files, this is currently only used by the magic rollback to create an inotify watcher in for confirmations
   # If not specified, this will default to `/tmp`
-  # (if `magicRollback` is in use, this _must_ be writable by `user`)
+  # (if magic rollback is in use, this _must_ be writable by `user`)
   tempPath = "/home/someuser/.deploy-rs";
 }
 ```

examples/system/flake.nix

@@ -23,8 +23,8 @@
     defaultPackage.x86_64-linux = import ./hello.nix nixpkgs;
 
     deploy.nodes.example = {
-      sshOpts = [ "-p" "2221" ];
-      hostname = "localhost";
+      sshOpts = [ "-i" "./path/to/private/key" ];
+      hostname = "localhost:2221";
       fastConnection = true;
       profiles = {
         system = {