X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Fapt.pp;fp=modules%2Fdebian_org%2Fmanifests%2Fapt.pp;h=3fc0979ee48f39e7234f53c06b697d4c9db9e859;hb=aec3d9af6d17e1ecf7eec086a233ec4836d0718b;hp=48b617e6e059bd5a5b8d22eeef09dbf439e713c5;hpb=04781beea263e356f8b43b95cdb566b7e32f76df;p=mirror%2Fdsa-puppet.git diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp index 48b617e6e..3fc0979ee 100644 --- a/modules/debian_org/manifests/apt.pp +++ b/modules/debian_org/manifests/apt.pp @@ -41,11 +41,7 @@ class debian_org::apt { } } - if has_role('experimental_apache') { - $dbdosuites = [ 'debian-all', $::lsbdistcodename, 'jessie-apache2' ] - } else { - $dbdosuites = [ 'debian-all', $::lsbdistcodename ] - } + $dbdosuites = [ 'debian-all', $::lsbdistcodename ] site::aptrepo { 'db.debian.org': url => 'http://db.debian.org/debian-admin', suite => $dbdosuites,