diff --git a/sysutils/ansible-sshjail/Makefile b/sysutils/ansible-sshjail/Makefile index b40cf6d8eb7c..698d0a95cf34 100644 --- a/sysutils/ansible-sshjail/Makefile +++ b/sysutils/ansible-sshjail/Makefile @@ -1,29 +1,29 @@ PORTNAME= ansible-sshjail DISTVERSIONPREFIX= v DISTVERSION= 1.1.0-30 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONSUFFIX= -g981674f CATEGORIES= sysutils MAINTAINER= madpilot@FreeBSD.org COMMENT= Ansible connector for remote jails LICENSE= MIT USES= ansible:plugin python ANSIBLE_PLUGIN_TYPE= connection USE_GITHUB= yes GH_ACCOUNT= austinhyde NO_ARCH= yes NO_BUILD= yes PLIST_FILES= ${ANSIBLE_PLUGINSDIR}/sshjail.py do-install: ${MKDIR} ${STAGEDIR}/${ANSIBLE_PLUGINSDIR} ${INSTALL_SCRIPT} ${WRKSRC}/sshjail.py \ ${STAGEDIR}/${ANSIBLE_PLUGINSDIR}/sshjail.py .include diff --git a/sysutils/ansible-sshjail/files/patch-sshjail.py b/sysutils/ansible-sshjail/files/patch-sshjail.py index f2b5b7d9d0c8..e27ec1ad5eef 100644 --- a/sysutils/ansible-sshjail/files/patch-sshjail.py +++ b/sysutils/ansible-sshjail/files/patch-sshjail.py @@ -1,76 +1,94 @@ From bcb0a961df77a0d7a3b2e7e58fac3e283b5ef8c4 Mon Sep 17 00:00:00 2001 From: Mohamad Safadieh Date: Wed, 5 May 2021 12:38:26 -0400 Subject: [PATCH] added sshpass_prompt, ssh_transfer_method, timeout ---- - sshjail.py | 42 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 42 insertions(+) - -diff --git a/sshjail.py b/sshjail.py -index 5973380..0e26c68 100644 ---- sshjail.py +--- sshjail.py.orig 2021-01-07 19:31:49 UTC +++ sshjail.py -@@ -49,6 +49,17 @@ +@@ -49,6 +49,17 @@ DOCUMENTATION = ''' vars: - name: ansible_password - name: ansible_ssh_pass + sshpass_prompt: + description: Password prompt that sshpass should search for. Supported by sshpass 1.06 and up + default: '' + ini: + - section: 'ssh_connection' + key: 'sshpass_prompt' + env: + - name: ANSIBLE_SSHPASS_PROMPT + vars: + - name: ansible_sshpass_prompt + version_added: '2.10' ssh_args: description: Arguments to pass to all ssh cli tools default: '-C -o ControlMaster=auto -o ControlPersist=60s' -@@ -247,6 +258,16 @@ +@@ -140,10 +151,9 @@ DOCUMENTATION = ''' + - key: ssh_extra_args + section: ssh_connection + version_added: '2.7' +- retries: +- # constant: ANSIBLE_SSH_RETRIES ++ reconnection_retries: + description: Number of attempts to connect. +- default: 3 ++ default: 0 + type: integer + env: + - name: ANSIBLE_SSH_RETRIES +@@ -153,8 +163,8 @@ DOCUMENTATION = ''' + - section: ssh_connection + key: retries + vars: +- - name: ansible_ssh_retries +- version_added: '2.7' ++ - name: ansible_ssh_retries ++ version_added: '2.7' + port: + description: Remote port to connect to. + type: int +@@ -247,6 +257,16 @@ DOCUMENTATION = ''' vars: - name: ansible_sftp_batch_mode version_added: '2.7' + ssh_transfer_method: + default: smart + description: + - "Preferred method to use when transferring files over ssh" + - Setting to 'smart' (default) will try them in order, until one succeeds or they all fail + - Using 'piped' creates an ssh pipe with ``dd`` on either side to copy the data + choices: ['sftp', 'scp', 'piped', 'smart'] + env: [{name: ANSIBLE_SSH_TRANSFER_METHOD}] + ini: + - {key: transfer_method, section: ssh_connection} scp_if_ssh: default: smart description: -@@ -270,6 +291,27 @@ +@@ -270,6 +290,27 @@ DOCUMENTATION = ''' vars: - name: ansible_ssh_use_tty version_added: '2.7' + timeout: + default: 10 + description: + - This is the default ammount of time we will wait while establishing an ssh connection + - It also controls how long we can wait to access reading the connection once established (select on the socket) + env: + - name: ANSIBLE_TIMEOUT + - name: ANSIBLE_SSH_TIMEOUT + version_added: '2.11' + ini: + - key: timeout + section: defaults + - key: timeout + section: ssh_connection + version_added: '2.11' + vars: + - name: ansible_ssh_timeout + version_added: '2.11' + cli: + - name: timeout + type: integer ''' try: