On Wed, 2011-07-06 at 11:02 -0500, Matt Domsch wrote:
> >From 4a42171734609da4c1e57012e64f9004ccd6f704 Mon Sep 17 00:00:00 2001
> From: Matt Domsch <mdomsch(a)fedoraproject.org>
> Date: Wed, 6 Jul 2011 15:54:07 +0000
> Subject: [PATCH 2/2] fix rsync mastermirror template syntax
>
> ---
> modules/rsync/manifests/mastermirror.pp | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/modules/rsync/manifests/mastermirror.pp
b/modules/rsync/manifests/mastermirror.pp
> index 1f1e0da..a33d990 100644
> --- a/modules/rsync/manifests/mastermirror.pp
> +++ b/modules/rsync/manifests/mastermirror.pp
> @@ -2,7 +2,7 @@ class rsync::mastermirror inherits rsync::server {
> $hosts_allow = "152.46.7.122 200.17.202.1/28
zeus1.kernel.org
zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36
199.6.1.170 130.239.17.3
sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de
josephine.hrz.tu-che mirror.speedpartner.de rsyncer.ftp.heanet.ie
archive.linux.duke.edu
lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 65.18.175.19
198.129.224.34
mirror.hiwaay.net sagres.c3sl.ufpr.br
mail.fedoraunity.org scrye.com
odysseus.fi.muni.cz rhlx01.hs-esslingen.de"
>
> file { "/etc/rsyncd.conf":
> - content =>
template("puppet:///rsync/rsyncd.conf.mastermirror.erb"),
> + content => template("rsync/rsyncd.conf.mastermirror.erb"),
> mode => 0644,
> require => Package["rsync"],
> }
Argh.
why are we using templates for this? Why not just use
rsyncd.conf.$hostname or rsyncd.conf.$group_of_some_kind?
it's WAY easier to read and we don't have to do this
templating-necromancy to figure out what we're going to break later.
What we have now is awful. edit rsyncd.conf.download0 in 2 places.
Copy that file to rsyncd.conf.download0[2345] and
rsyncd.conf.download-rdu0[123]. Commit same change to all files.
Could do $group_of_some_kind w/o templates I suppose. Still leaves
the editing in 2 places (which I've forgotten to do the second one as
recently as yesterday) though. The template makes that one edit.
--
Matt Domsch
Technology Strategist
Dell | Office of the CTO