From cc47310d8939c7c9723ea5b8a156f17656645e82 Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Tue, 21 May 2019 10:21:53 +0300 Subject: [PATCH] retry fixing tls version --- roles/rsync/client/tasks/main.yml | 4 ++-- roles/rsync/client/templates/rsync-ssl-tunnel.j2 | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/roles/rsync/client/tasks/main.yml b/roles/rsync/client/tasks/main.yml index 0ddf79b..05273b4 100644 --- a/roles/rsync/client/tasks/main.yml +++ b/roles/rsync/client/tasks/main.yml @@ -9,9 +9,9 @@ - stunnel - name: install rsync stunnel wrapper - copy: + template: dest: /usr/local/libexec/rsync-ssl-tunnel - src: rsync-ssl-tunnel + src: rsync-ssl-tunnel.j2 mode: 0755 owner: root group: root diff --git a/roles/rsync/client/templates/rsync-ssl-tunnel.j2 b/roles/rsync/client/templates/rsync-ssl-tunnel.j2 index ae2d509..7dd052d 100755 --- a/roles/rsync/client/templates/rsync-ssl-tunnel.j2 +++ b/roles/rsync/client/templates/rsync-ssl-tunnel.j2 @@ -1,7 +1,5 @@ #!/bin/bash -echo "$@" > /tmp/foo.out - key="/etc/pki/tls/private/$(hostname -f).key" cert="/etc/pki/tls/certs/$(hostname -f).crt" cafile="/etc/pki/tls/certs/ca.crt" @@ -17,7 +15,7 @@ hostname=$1 shift if [ x"$hostname" = x -o x"$1" != x"rsync" -o x"$2" != x"--server" -o x"$3" != x"--daemon" ]; then - echo "Usage: stunnel-rsync HOSTNAME rsync --server --daemon ." 1>&2 + echo "Usage: rsync-ssl-tunnel HOSTNAME rsync --server --daemon ." 1>&2 exit 1 fi @@ -32,4 +30,5 @@ verify = 2 cert = $cert key = $key CAfile = $cafile +sslVersion = {{ tls_protocols }} EOF