Skip to content

Commit

Permalink
Fix local deployment with SSH options without sudo
Browse files Browse the repository at this point in the history
Due to a typo, SSH options would be ignored for `rebuild` when using
`lollypops.deployment.local-evaluation = true`,
`lollypops.deployment.sudo.enable = false`, and
`lollypops.deployment.ssh.opts`.
Since SSH options can be overriden at runtime, and having an empty
NIX_SSHOPTS doesn't seem to be an issue, I removed the Nix-time switch
altogether.
  • Loading branch information
GeoffreyFrogeye committed Apr 6, 2024
1 parent 23e8069 commit 17239c6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
cmds = [
(if hostConfig.config.lollypops.deployment.local-evaluation then
''
${optionalString useSudo ''NIX_SSHOPTS="{{.REMOTE_SSH_OPTS}}"''} nixos-rebuild {{.REBUILD_ACTION}} \
NIX_SSHOPTS="{{.REMOTE_SSH_OPTS}}" nixos-rebuild {{.REBUILD_ACTION}} \
--flake '{{.LOCAL_FLAKE_SOURCE}}#{{.HOSTNAME}}' \
--target-host {{.REMOTE_USER}}@{{.REMOTE_HOST}} \
${optionalString useSudo "--use-remote-sudo"}
Expand Down

0 comments on commit 17239c6

Please sign in to comment.