From 4939162b3524926ead9e4a832c314b78d379b770 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 19 Mar 2017 09:02:22 +0000 Subject: [PATCH] Do not use sslname empty string for no ssl --- modules/roles/manifests/historical_mirror.pp | 2 +- modules/rsync/manifests/site.pp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/roles/manifests/historical_mirror.pp b/modules/roles/manifests/historical_mirror.pp index d80b1afb4..5036e8fbc 100644 --- a/modules/roles/manifests/historical_mirror.pp +++ b/modules/roles/manifests/historical_mirror.pp @@ -29,7 +29,7 @@ class roles::historical_mirror { tlsaport => [], } } else { - $sslname = '' + $sslname = undef } rsync::site_systemd { 'archive': diff --git a/modules/rsync/manifests/site.pp b/modules/rsync/manifests/site.pp index ba73c2c15..04c1e20e9 100644 --- a/modules/rsync/manifests/site.pp +++ b/modules/rsync/manifests/site.pp @@ -5,7 +5,7 @@ define rsync::site ( $content=undef, $max_clients=200, $ensure=present, - $sslname='', + $sslname=undef, $sslport=1873 ){ @@ -62,7 +62,7 @@ define rsync::site ( } } - if $sslname != '' { + if $sslname { file { "/etc/rsyncd-${name}-stunnel.conf": content => template('rsync/rsyncd-stunnel.conf.erb'), require => File["/etc/ssl/debian/certs/${sslname}.crt-chained"], -- 2.20.1