Do not use sslname empty string for no ssl
authorPeter Palfrader <peter@palfrader.org>
Sun, 19 Mar 2017 09:02:22 +0000 (09:02 +0000)
committerPeter Palfrader <peter@palfrader.org>
Sun, 19 Mar 2017 09:02:22 +0000 (09:02 +0000)
modules/roles/manifests/historical_mirror.pp
modules/rsync/manifests/site.pp

index d80b1af..5036e8f 100644 (file)
@@ -29,7 +29,7 @@ class roles::historical_mirror {
                        tlsaport => [],
                }
        } else {
-               $sslname = ''
+               $sslname = undef
        }
 
        rsync::site_systemd { 'archive':
index ba73c2c..04c1e20 100644 (file)
@@ -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"],