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

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 9da7de538..912cfd616 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -62,13 +62,13 @@ class debian-org {
 
 	if $::debarchitecture != 'armhf' {
 		site::aptrepo { 'security':
-			content => template('debian-org/etc/apt/sources.list.d/security.list.erb'),
+			template => 'debian-org/etc/apt/sources.list.d/security.list.erb',
 		}
 		site::aptrepo { 'backports.debian.org':
-			content => template('debian-org/etc/apt/sources.list.d/backports.debian.org.list.erb'),
+			template => 'debian-org/etc/apt/sources.list.d/backports.debian.org.list.erb',
 		}
 		site::aptrepo { 'volatile':
-			content => template('debian-org/etc/apt/sources.list.d/volatile.list.erb'),
+			template => 'debian-org/etc/apt/sources.list.d/volatile.list.erb',
 		}
 	}
 	site::aptrepo { 'backports.org':
@@ -82,8 +82,8 @@ class debian-org {
 	}
 
 	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',
+		template => 'debian-org/etc/apt/sources.list.d/debian.org.list.erb',
+		key      => 'puppet:///modules/debian-org/db.debian.org.asc',
 	}
 
 	file { '/etc/facter':
@@ -137,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',
@@ -165,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,
@@ -173,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',