diff --git a/rffmpeg.py b/rffmpeg.py index 7c4925a..3d6a067 100755 --- a/rffmpeg.py +++ b/rffmpeg.py @@ -74,6 +74,7 @@ try: "remote_hosts": o_config["rffmpeg"]["remote"]["hosts"], "remote_user": o_config["rffmpeg"]["remote"]["user"], "remote_args": o_config["rffmpeg"]["remote"]["args"], + "ssh_command": o_config["rffmpeg"]["commands"]["ssh"], "pre_commands": o_config["rffmpeg"]["commands"]["pre"], "ffmpeg_command": o_config["rffmpeg"]["commands"]["ffmpeg"], "ffprobe_command": o_config["rffmpeg"]["commands"]["ffprobe"], @@ -208,7 +209,7 @@ def setup_remote_command(target_host): rffmpeg_ffmpeg_command = list() # Add SSH component - rffmpeg_ssh_command.append("ssh") + rffmpeg_ssh_command.append(config["ssh_command"]) rffmpeg_ssh_command.append("-q") # Set our connection timeouts, in case one of several remote machines is offline diff --git a/rffmpeg.yml.sample b/rffmpeg.yml.sample index 8882de5..70f0cd3 100644 --- a/rffmpeg.yml.sample +++ b/rffmpeg.yml.sample @@ -43,6 +43,10 @@ rffmpeg: # Remote command configuration commands: + # By default rffmpeg uses $PATH to find the "ssh" program; use this option to set a full path + # to an SSH binary if you want to override the default. + ssh: "ssh" + # A YAML list of prefixes to the ffmpeg command (e.g. sudo, nice, etc.), # one line per space-separated command element. pre: