Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333830 )
Change subject: aptrepo:rsync: fix 'Invalid relationship' and ferm syntax
......................................................................
aptrepo:rsync: fix 'Invalid relationship' and ferm syntax
Can't absent the rsync fragment when rsync server is not in catalog.
"Invalid relationship"
Do not add /32 in ferm rule. wrong syntax.
Change-Id: I5a452c3e7349bffc0ee9ed8a42e8a001e268bf2d
---
M modules/aptrepo/manifests/rsync.pp
1 file changed, 9 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/aptrepo/manifests/rsync.pp
b/modules/aptrepo/manifests/rsync.pp
index 56aad73..b56ffd7 100644
--- a/modules/aptrepo/manifests/rsync.pp
+++ b/modules/aptrepo/manifests/rsync.pp
@@ -6,8 +6,16 @@
# only activate rsync/firewall hole on the server that is NOT active
if $::fqdn != $primary_server {
+
$ensure = 'present'
include rsync::server
+
+ rsync::server::module { 'aptrepo-basedir':
+ ensure => $aptrepo::rsync::ensure,
+ path => $aptrepo::basedir,
+ read_only => 'no',
+ hosts_allow => "@resolve(${primary_server})",
+ }
} else {
$ensure = 'absent'
}
@@ -16,13 +24,6 @@
ensure => $aptrepo::rsync::ensure,
proto => 'tcp',
port => '873',
- srange => "@resolve(${primary_server})/32",
- }
-
- rsync::server::module { 'aptrepo-basedir':
- ensure => $aptrepo::rsync::ensure,
- path => $aptrepo::basedir,
- read_only => 'no',
- hosts_allow => "@resolve(${primary_server})",
+ srange => "@resolve(${primary_server})",
}
}
--
To view, visit https://gerrit.wikimedia.org/r/333830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a452c3e7349bffc0ee9ed8a42e8a001e268bf2d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
