From: Stephen Gran Date: Sat, 14 Apr 2012 10:40:56 +0000 (+0200) Subject: stop making all that noise X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1c542036b720098c5a558f25a1872475463797f9;p=dsa-puppet.git stop making all that noise Signed-off-by: Stephen Gran --- diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 369aade3..9654de9f 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -68,6 +68,7 @@ class debian-org { template => 'debian-org/etc/apt/sources.list.d/backports.debian.org.list.erb', } site::aptrepo { 'volatile': + noop => true, template => 'debian-org/etc/apt/sources.list.d/volatile.list.erb', } } diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb index 31019200..af8fcb9c 100644 --- a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb +++ b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb @@ -3,8 +3,6 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -<% if lsbdistcodename == 'lenny' %> -deb http://volatile.debian.org/debian-volatile lenny/volatile main contrib non-free -<% elsif lsbdistcodename != 'n/a' %> +<% unless %w{lenny n/a}.include?(scope.lookupvar('::lsbdistcodename')) %> deb http://ftp.debian.org/debian <%= lsbdistcodename %>-updates main contrib non-free <% end %>