Don't insert the address option if not specified.

puppetlabs · Mar 30, 2023 · c124213 · c124213
1 parent 771aa03
commit c124213
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/manifests/server.pp b/manifests/server.pp
@@ -8,7 +8,7 @@
 #
 class rsync::server(
   Boolean                                    $use_xinetd = true,
-  $address                                               = '0.0.0.0',
+  $address                                               = 'UNSET',
   $motd_file                                             = 'UNSET',
   Variant[Enum['UNSET'], Stdlib::Absolutepath] $pid_file = '/var/run/rsyncd.pid',
   $use_chroot                                            = 'yes',
@@ -26,12 +26,17 @@
   if $use_xinetd {
     include xinetd
     xinetd::service { 'rsync':
-      bind        => $address,
       port        => '873',
       server      => '/usr/bin/rsync',
       server_args => "--daemon --config ${conf_file}",
       require     => Package['rsync'],
     }
+
+    if ($address != 'UNSET') {
+      Xinetd::Service['rsync'] {
+        bind => $address,
+      }
+    }
   } else {
 
     # Manage the installation of the rsyncd package?

diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb
@@ -9,12 +9,11 @@
       describe 'when using default params' do
         it {
           is_expected.to contain_class('xinetd')
-          is_expected.to contain_xinetd__service('rsync').with(bind: '0.0.0.0')
+          is_expected.to contain_xinetd__service('rsync').with(port: 873)
           is_expected.not_to contain_service('rsync')
           is_expected.not_to contain_file('/etc/rsync-motd')
           is_expected.to contain_concat__fragment('rsyncd_conf_header').with(order: '00_header')
           is_expected.to contain_concat__fragment('rsyncd_conf_header').with_content(%r{^use chroot\s*=\s*yes$})
-          is_expected.to contain_concat__fragment('rsyncd_conf_header').with_content(%r{^address\s*=\s*0.0.0.0$})
           is_expected.to contain_concat__fragment('rsyncd_conf_header').with_content(%r{^pid file\s*=\s*/var/run/rsyncd.pid$})
         }
       end
@@ -76,6 +75,7 @@
         end
 
         it {
+          is_expected.to contain_xinetd__service('rsync').with(bind: '10.0.0.42')
           is_expected.to contain_concat__fragment('rsyncd_conf_header').with_content(%r{^address\s*=\s*10.0.0.42$})
         }
       end

diff --git a/templates/header.erb b/templates/header.erb
@@ -10,7 +10,9 @@ use chroot = <%= @use_chroot %>
 log format = %t %a %m %f %b
 syslog facility = local3
 timeout = 300
+<% if @address != 'UNSET' -%>
 address = <%= @address %>
+<% end -%>
 <% if @motd_file != 'UNSET' -%>
 motd file = <%= @motd_file %>
 <% end -%>