Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334237 )
Change subject: aptrepo: fix rsyncd 'hosts allow' syntax
......................................................................
aptrepo: fix rsyncd 'hosts allow' syntax
In the rsyncd 'hosts allow' we can use either hostnames
or IPs or wildcards. But this resulted in a literal 'resolve'
in the rsyncd config and that was not intended and fails.
Bug: T132757
Change-Id: Ibca80da18f41571e885107773011aae80f514641
---
M modules/aptrepo/manifests/rsync.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/334237/1
diff --git a/modules/aptrepo/manifests/rsync.pp
b/modules/aptrepo/manifests/rsync.pp
index b56ffd7..d8b333c 100644
--- a/modules/aptrepo/manifests/rsync.pp
+++ b/modules/aptrepo/manifests/rsync.pp
@@ -10,11 +10,11 @@
$ensure = 'present'
include rsync::server
- rsync::server::module { 'aptrepo-basedir':
+ rsync::server::module { 'aptrepo':
ensure => $aptrepo::rsync::ensure,
path => $aptrepo::basedir,
read_only => 'no',
- hosts_allow => "@resolve(${primary_server})",
+ hosts_allow => $primary_server,
}
} else {
$ensure = 'absent'
--
To view, visit https://gerrit.wikimedia.org/r/334237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibca80da18f41571e885107773011aae80f514641
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
