Skip to content

Fixes for server header #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fixes for server header #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a870a0
Fixes for server header
Natrinicle Jun 28, 2017
3287e23
Fixes for server header
Natrinicle Jun 28, 2017
a103028
Merge branch 'server_header' of github.com:Natrinicle/puppetlabs-rsyn…
Natrinicle Jul 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#
class rsync::server(
$use_xinetd = true,
$address = '0.0.0.0',
$motd_file = 'UNSET',
$address = undef,
$motd_file = undef,
$use_chroot = 'yes',
$uid = 'nobody',
$gid = 'nobody',
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/server_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
:order => '00_header',
})
is_expected.to contain_concat__fragment('rsyncd_conf_header').with_content(/^use chroot\s*=\s*yes$/)
is_expected.to contain_concat__fragment('rsyncd_conf_header').with_content(/^address\s*=\s*0.0.0.0$/)
is_expected.not_to contain_concat__fragment('rsyncd_conf_header').with_content(/^address\s*=.*$/)
}
end

Expand Down
4 changes: 3 additions & 1 deletion templates/header.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ use chroot = <%= @use_chroot %>
log format = %t %a %m %f %b
syslog facility = local3
timeout = 300
<% if @address -%>
address = <%= @address %>
<% if @motd_file != 'UNSET' -%>
<% end -%>
<% if @motd_file -%>
motd file = <%= @motd_file %>
<% end -%>