Andrew Bogott has submitted this change and it was merged.
Change subject: Convert the nfs rsyncd to the new rsync module.
......................................................................
Convert the nfs rsyncd to the new rsync module.
Change-Id: I284b898167ea684b90eb18a10b38d303d89e59b8
---
D files/rsync/rsyncd.conf.home
M manifests/nfs.pp
2 files changed, 7 insertions(+), 12 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.home b/files/rsync/rsyncd.conf.home
deleted file mode 100644
index 51f06d1..0000000
--- a/files/rsync/rsyncd.conf.home
+++ /dev/null
@@ -1,10 +0,0 @@
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/rsync/rsyncd.conf.home
-#####################################################################
-
-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
-
-[httpdconf]
-read only=true
-path=/home/wikipedia/conf/httpd
diff --git a/manifests/nfs.pp b/manifests/nfs.pp
index 74138ae..005a538 100644
--- a/manifests/nfs.pp
+++ b/manifests/nfs.pp
@@ -324,6 +324,11 @@
class misc::nfs-server::home::rsyncd {
system_role { "misc::nfs-server::home::rsyncd": description => "/home
rsync daemon" }
- class { 'generic::rsyncd': config => "home" }
+ include rsync::server
+ rsync::server::module {
+ 'httpdconf':
+ path => '/home/wikipedia/conf/httpd',
+ 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/71124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I284b898167ea684b90eb18a10b38d303d89e59b8
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
