Faidon Liambotis has submitted this change and it was merged.

Change subject: mirrors: allow public rsync access to Debian
......................................................................


mirrors: allow public rsync access to Debian

Be nice and let any potential downstream to pull from us :)

Change-Id: I60aeeb1265e69e5e762790c9da8d76ab90092821
---
M modules/mirrors/manifests/debian.pp
M modules/mirrors/manifests/serve.pp
2 files changed, 4 insertions(+), 12 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/mirrors/manifests/debian.pp 
b/modules/mirrors/manifests/debian.pp
index f0d2968..8edafbc 100644
--- a/modules/mirrors/manifests/debian.pp
+++ b/modules/mirrors/manifests/debian.pp
@@ -63,12 +63,10 @@
     }
 
     rsync::server::module { 'debian':
-        path         => '/srv/mirrors/debian/',
-        read_only    => 'yes',
-        uid          => 'nobody',
-        gid          => 'nogroup',
-        auth_users   => ['mirrors.wikimedia.org'],
-        secrets_file => '/etc/rsyncd.secrets',
+        path      => '/srv/mirrors/debian/',
+        read_only => 'yes',
+        uid       => 'nobody',
+        gid       => 'nogroup',
     }
 
 }
diff --git a/modules/mirrors/manifests/serve.pp 
b/modules/mirrors/manifests/serve.pp
index a6ea5f0..a2fb059 100644
--- a/modules/mirrors/manifests/serve.pp
+++ b/modules/mirrors/manifests/serve.pp
@@ -24,11 +24,5 @@
 
     # rsync
     include rsync::server
-    file { '/etc/rsyncd.secrets':
-        content => secret('mirrors/rsyncd.secrets'),
-        owner   => 'root',
-        group   => 'root',
-        mode    => '0440',
-    }
 
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/319367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I60aeeb1265e69e5e762790c9da8d76ab90092821
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to