try to order these a bit

[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 47ea1a99b140477be69a508fd2788982b4a549b0..c3488e503c0dbb233cfd5d58b2a91d2a5a358371 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -64,14 +64,18 @@ class debian-org {
                site::aptrepo { 'security':
                        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':
+                       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',
                }
        }
+       site::aptrepo { 'backports.org':
+               ensure => absent,
+               keyid => '16BA136C',
+               key => 'puppet:///modules/debian-org/backports.org.asc',
+       }
 
        site::aptrepo { 'debian.org':
                ensure => absent,
@@ -82,6 +86,19 @@ class debian-org {
                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',
        }
@@ -120,6 +137,10 @@ class debian-org {
                require => Package['debian.org'],
                content => template('debian-org/pam.common-session.erb'),
        }
+       file { '/etc/pam.d/common-session-noninteractive':
+               require => Package['debian.org'],
+               content => template('debian-org/pam.common-session-noninteractive.erb'),
+       }
        file { '/etc/rc.local':
                mode   => '0755',
                source => 'puppet:///modules/debian-org/rc.local',
@@ -148,6 +169,9 @@ class debian-org {
        site::alternative { 'editor':
                linkto => '/usr/bin/vim.basic',
        }
+       site::alternative { 'view':
+               linkto => '/usr/bin/vim.basic',
+       }
        mailalias { 'samhain-reports':
                ensure => present,
                recipient => $debianadmin,
@@ -155,8 +179,9 @@ class debian-org {
 
        exec { 'apt-get update':
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+               stage       => setup_infra,
                refreshonly => true,
-       }-> Package <| |>
+       }
 
        exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',