X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=912cfd616f9f2383133518be8571668e49f19a94;hb=5a8df552f7733b7498c23be8e5a4f72cd9c4902b;hp=554c083489db78958e58c607ad6ddb0cf49bf482;hpb=132ca45393a7d7fe277a5eb391e211d2c1775d24;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 554c08348..912cfd616 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -64,20 +64,41 @@ 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,
+	}
+
+	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',
 	}
 
+	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',
 	}
@@ -116,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',
@@ -144,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,
@@ -152,7 +180,7 @@ class debian-org {
 	exec { 'apt-get update':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
 		refreshonly => true,
-	}-> Package <| |>
+	}
 
 	exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',