Andrew Bogott has submitted this change and it was merged.
Change subject: Convert scap's rsyncd to the new rsync module.
......................................................................
Convert scap's rsyncd to the new rsync module.
Change-Id: I358756c558dcf1c0ef7a92698cc35e91cb1dd994
---
D files/rsync/rsyncd.conf.scap-primary
M manifests/misc/deployment.pp
2 files changed, 7 insertions(+), 13 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Mark Bergsma: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/files/rsync/rsyncd.conf.scap-primary
b/files/rsync/rsyncd.conf.scap-primary
deleted file mode 100644
index c7d8d06..0000000
--- a/files/rsync/rsyncd.conf.scap-primary
+++ /dev/null
@@ -1,12 +0,0 @@
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/rsync/rsyncd.conf.scap-primary
-#####################################################################
-
-hosts allow = 10.0.0.0/16 10.64.0.0/22 10.64.16.0/24 208.80.152.0/22
10.64.32.0/22
-
-[common]
-read only=true
-path=/a/common
-
-
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 95f1efe..047e44c 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -383,5 +383,11 @@
}
class misc::deployment::scap_primary {
- class { 'generic::rsyncd': config => "scap-primary" }
+ include rsync::server
+ rsync::server::module {
+ 'common':
+ path => '/a/common',
+ read_only => 'true',
+ hosts_allow => ['10.0.0.0/16', '10.64.0.0/22',
'10.64.16.0/24', '208.80.152.0/22', '10.64.32.0/22'];
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/71123
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I358756c558dcf1c0ef7a92698cc35e91cb1dd994
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
