BBlack has submitted this change and it was merged.
Change subject: fix rsync ipv6 hosts allow/deny
......................................................................
fix rsync ipv6 hosts allow/deny
This is hacky, but rsync doesn't allow a netmask on an ipv6
network, whereas our network::constants lists will typically have
it and other config files expect it. Rsync seems to assume an
implicit /64 and all the current networks we use with this are
/64, so...
Change-Id: Ib4e6fc3610aa0fdc9357b7d40496887400c05cc0
---
M modules/rsync/templates/module.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/rsync/templates/module.erb
b/modules/rsync/templates/module.erb
index f37a474..d6418a1 100644
--- a/modules/rsync/templates/module.erb
+++ b/modules/rsync/templates/module.erb
@@ -13,7 +13,7 @@
<% if @comment %>comment = <%= @comment %><% end %>
<% if @secrets_file %>secrets file = <%= @secrets_file %><% end %>
<% if @auth_users %>auth users = <%= @auth_users.to_a.join(', ')%><% end %>
-<% if @hosts_allow %>hosts allow = <%= @hosts_allow.to_a.join(' ')%><% end %>
-<% if @hosts_deny %>hosts deny = <%= @hosts_deny.to_a.join(' ')%><% end %>
+<% if @hosts_allow %>hosts allow = <%= @hosts_allow.to_a.join('
').gsub('::/64','::') %><% end %>
+<% if @hosts_deny %>hosts deny = <%= @hosts_deny.to_a.join(' ').gsub('::/64',
'::') %><% end %>
--
To view, visit https://gerrit.wikimedia.org/r/217457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4e6fc3610aa0fdc9357b7d40496887400c05cc0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
