Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/379517 )
Change subject: Template-ise rsync/public.pp hosts allow ...................................................................... Template-ise rsync/public.pp hosts allow Change-Id: I4ac3ddde00afc8b921b5b8846a8e657c0f3cae23 --- M modules/dataset/files/rsync/rsyncd.conf.dumps_to_public M modules/dataset/manifests/rsync/public.pp 2 files changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/17/379517/2 diff --git a/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public b/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public index a81f496..c3d7ac9 100644 --- a/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public +++ b/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public @@ -33,7 +33,7 @@ read only = true path = /data/xmldatadumps/public exclude = **tmp/ **temp/ **bad/ **save/ **other/ **archive/ -hosts allow = sagres.c3sl.ufpr.br odysseus.fi.muni.cz odysseus.linux.cz odysseus.ip6.fi.muni.cz poincare.acc.umu.se wikimedia.bytemark.co.uk +hosts allow = <%= @hosts_allow %> # these are the modules to advertise @@ -44,7 +44,7 @@ include = /*wik*/ exclude = **tmp/ **temp/ **bad/ **save/ **other/ **archive/ **not/ /* /*/ /*/*/ include from = /data/xmldatadumps/public/rsync-inc-last-5.txt -hosts allow = sagres.c3sl.ufpr.br odysseus.fi.muni.cz odysseus.linux.cz odysseus.ip6.fi.muni.cz poincare.acc.umu.se wikimedia.bytemark.co.uk +hosts allow = <%= @hosts_allow %> [dumpslastfour] read only = true @@ -53,7 +53,7 @@ include = /*wik*/ exclude = **tmp/ **temp/ **bad/ **save/ **other/ **archive/ **not/ /* /*/ /*/*/ include from = /data/xmldatadumps/public/rsync-inc-last-4.txt -hosts allow = sagres.c3sl.ufpr.br odysseus.fi.muni.cz odysseus.linux.cz odysseus.ip6.fi.muni.cz poincare.acc.umu.se wikimedia.bytemark.co.uk +hosts allow = <%= @hosts_allow %> [dumpslastthree] read only = true @@ -62,7 +62,7 @@ include = /*wik*/ exclude = **tmp/ **temp/ **bad/ **save/ **other/ **archive/ **not/ /* /*/ /*/*/ include from = /data/xmldatadumps/public/rsync-inc-last-3.txt -hosts allow = sagres.c3sl.ufpr.br odysseus.fi.muni.cz odysseus.linux.cz odysseus.ip6.fi.muni.cz poincare.acc.umu.se wikimedia.bytemark.co.uk +hosts allow = <%= @hosts_allow %> [dumpslasttwo] read only = true @@ -71,7 +71,7 @@ include = /*wik*/ exclude = **tmp/ **temp/ **bad/ **save/ **other/ **archive/ **not/ /* /*/ /*/*/ include from = /data/xmldatadumps/public/rsync-inc-last-2.txt -hosts allow = sagres.c3sl.ufpr.br odysseus.fi.muni.cz odysseus.linux.cz odysseus.ip6.fi.muni.cz poincare.acc.umu.se wikimedia.bytemark.co.uk +hosts allow = <%= @hosts_allow %> [dumpslastone] read only = true @@ -80,7 +80,7 @@ include = /*wik*/ exclude = **tmp/ **temp/ **bad/ **save/ **other/ **archive/ **not/ /* /*/ /*/*/ include from = /data/xmldatadumps/public/rsync-inc-last-1.txt -hosts allow = sagres.c3sl.ufpr.br odysseus.fi.muni.cz odysseus.linux.cz odysseus.ip6.fi.muni.cz poincare.acc.umu.se wikimedia.bytemark.co.uk +hosts allow = <%= @hosts_allow %> [dumpmirrorsother] read only = true diff --git a/modules/dataset/manifests/rsync/public.pp b/modules/dataset/manifests/rsync/public.pp index 669062d..efa43b0 100644 --- a/modules/dataset/manifests/rsync/public.pp +++ b/modules/dataset/manifests/rsync/public.pp @@ -5,6 +5,8 @@ else { $ensure = 'absent' } + + $hosts_allow = 'sagres.c3sl.ufpr.br odysseus.fi.muni.cz odysseus.linux.cz odysseus.ip6.fi.muni.cz poincare.acc.umu.se wikimedia.bytemark.co.uk' include ::dataset::common include ::dataset::rsync::common @@ -13,7 +15,7 @@ mode => '0444', owner => 'root', group => 'root', - source => 'puppet:///modules/dataset/rsync/rsyncd.conf.dumps_to_public', + content => template('dataset/rsync/rsyncd.conf.dumps_to_public'), notify => Exec['update-rsyncd.conf'], } } -- To view, visit https://gerrit.wikimedia.org/r/379517 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ac3ddde00afc8b921b5b8846a8e657c0f3cae23 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Reedy <re...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits