Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/290895
Change subject: rsync: allow extra settings in rsyncd.conf
......................................................................
rsync: allow extra settings in rsyncd.conf
Allow injecting additional rsyncd settings. The hash $rsyncd_conf which
is expanded in headers and would let us tweak global rsyncd settings.
Expansion is copied from modules/sysfs/templates/sysfs.conf.erb by
Faidon.
Example usage:
class { 'rsync::server':
$rsyncd_conf = {
'forward lookup' => 'no',
}
}
Yields in rsyncd.conf:
forward lookup = no
Bug: T136276
Change-Id: I910c8498a96082e354cc076e68012765d8c99119
---
M modules/rsync/manifests/server.pp
M modules/rsync/templates/header.erb
2 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/290895/1
diff --git a/modules/rsync/manifests/server.pp
b/modules/rsync/manifests/server.pp
index f3ee7a3..05c9a86 100644
--- a/modules/rsync/manifests/server.pp
+++ b/modules/rsync/manifests/server.pp
@@ -18,6 +18,7 @@
$log_file = 'UNSET',
$use_chroot = 'yes',
$rsync_opts = [],
+ $rsyncd_conf = {},
) inherits rsync {
$rsync_fragments = '/etc/rsync.d'
diff --git a/modules/rsync/templates/header.erb
b/modules/rsync/templates/header.erb
index c6b8e50..42f4192 100644
--- a/modules/rsync/templates/header.erb
+++ b/modules/rsync/templates/header.erb
@@ -10,3 +10,8 @@
timeout = <%= @timeout %>
address = <%= @address %>
<% if @motd_file != 'UNSET' %>motd file = <%= @motd_file %><% end %>
+<%=
+ @rsyncd_conf.sort.map { |k, v|
+ [ k, v ].join(' = ')
+ }.join("\n")
+%>
--
To view, visit https://gerrit.wikimedia.org/r/290895
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I910c8498a96082e354cc076e68012765d8c99119
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
