make site::aptrepo a proper type

[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 c3488e503c0dbb233cfd5d58b2a91d2a5a358371..8c76900209ecb9c0ceb804e0929eb4ead90687a3 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -13,14 +13,22 @@ class debian-org {
                        'sysklogd',
                        'rsyslog',
                ]:
-                       ensure => purged,
+               ensure => purged,
+       }
+       package { [
+                       'debian.org',
+                       'dsa-munin-plugins',
+               ]:
+               ensure => installed,
+               require => [
+                       File['/etc/apt/sources.list.d/db.debian.org.list'],
+                       Exec['apt-get update']
+               ]
        }
        package { [
                        'apt-utils',
                        'bash-completion',
-                       'debian.org',
                        'dnsutils',
-                       'dsa-munin-plugins',
                        'less',
                        'lsb-release',
                        'libfilesystem-ruby1.8',
@@ -29,7 +37,7 @@ class debian-org {
                        'nload',
                        'pciutils',
                ]:
-                       ensure => installed,
+               ensure => installed,
        }
 
        munin::check { [
@@ -54,7 +62,11 @@ class debian-org {
 
        if getfromhash($site::nodeinfo, 'broken-rtc') {
                package { 'fake-hwclock':
-                       ensure => installed
+                       ensure => installed,
+                       require => [
+                               File['/etc/apt/sources.list.d/db.debian.org.list'],
+                               Exec['apt-get update']
+                       ]
                }
        }
 
@@ -62,13 +74,21 @@ class debian-org {
 
        if $::debarchitecture != 'armhf' {
                site::aptrepo { 'security':
-                       template => 'debian-org/etc/apt/sources.list.d/security.list.erb',
+                       url        => 'http://security.debian.org/',
+                       suite      => "${::lsbdistcodename}/updates",
+                       components => ['main','contrib','non-free']
                }
+
                site::aptrepo { 'backports.debian.org':
-                       template => 'debian-org/etc/apt/sources.list.d/backports.debian.org.list.erb',
+                       url        => 'http://backports.debian.org/debian-backports/',
+                       suite      => "${::lsbdistcodename}-backports",
+                       components => ['main','contrib','non-free']
                }
+
                site::aptrepo { 'volatile':
-                       template => 'debian-org/etc/apt/sources.list.d/volatile.list.erb',
+                       url        => 'http://ftp.debian.org/debian',
+                       suite      => "${::lsbdistcodename}-updates",
+                       components => ['main','contrib','non-free']
                }
        }
        site::aptrepo { 'backports.org':
@@ -82,8 +102,10 @@ class debian-org {
        }
 
        site::aptrepo { 'db.debian.org':
-               template => 'debian-org/etc/apt/sources.list.d/debian.org.list.erb',
-               key      => 'puppet:///modules/debian-org/db.debian.org.asc',
+               url        => 'http://db.debian.org/debian-admin',
+               suite      => 'lenny',
+               components => 'main',
+               key        => 'puppet:///modules/debian-org/db.debian.org.asc',
        }
 
        file { '/etc/facter':
@@ -179,7 +201,6 @@ class debian-org {
 
        exec { 'apt-get update':
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-               stage       => setup_infra,
                refreshonly => true,
        }