simplify site::aptrepo

[dsa-puppet.git] / modules / debian-org / manifests / init.pp

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 554c083489db78958e58c607ad6ddb0cf49bf482..9da7de5381bba4e5733bd1e49be6e686244b9ff0 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -62,22 +62,43 @@ class debian-org {
 
        if $::debarchitecture != 'armhf' {
                site::aptrepo { 'security':
-                       template => 'debian-org/etc/apt/sources.list.d/security.list.erb',
+                       content => template('debian-org/etc/apt/sources.list.d/security.list.erb'),
                }
-               site::aptrepo { 'backports.org':
-                       template => 'debian-org/etc/apt/sources.list.d/backports.org.list.erb',
-                       key      => 'puppet:///modules/debian-org/backports.org.asc',
+               site::aptrepo { 'backports.debian.org':
+                       content => template('debian-org/etc/apt/sources.list.d/backports.debian.org.list.erb'),
                }
                site::aptrepo { 'volatile':
-                       template => 'debian-org/etc/apt/sources.list.d/volatile.list.erb',
+                       content => template('debian-org/etc/apt/sources.list.d/volatile.list.erb'),
                }
        }
+       site::aptrepo { 'backports.org':
+               ensure => absent,
+               keyid => '16BA136C',
+               key => 'puppet:///modules/debian-org/backports.org.asc',
+       }
 
        site::aptrepo { 'debian.org':
-               template => 'debian-org/etc/apt/sources.list.d/debian.org.list.erb',
-               key      => 'puppet:///modules/debian-org/db.debian.org.asc',
+               ensure => absent,
+       }
+
+       site::aptrepo { 'db.debian.org':
+               content => template('debian-org/etc/apt/sources.list.d/debian.org.list.erb'),
+               key     => 'puppet:///modules/debian-org/db.debian.org.asc',
        }
 
+       file { '/etc/facter':
+               ensure  => directory,
+               purge   => true,
+               force   => true,
+               recurse => true,
+               source  => 'puppet:///files/empty/',
+       }
+       file { '/etc/facter/facts.d':
+               ensure => directory,
+       }
+       file { '/etc/facter/facts.d/debian_facts.yaml':
+               content => template('debian-org/debian_facts.yaml.erb')
+       }
        file { '/etc/apt/preferences':
                source => 'puppet:///modules/debian-org/apt.preferences',
        }