Fix view alternative on some hosts like bendel

[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 9da7de5381bba4e5733bd1e49be6e686244b9ff0..f7f278fbf82a5ea857aa7d0f12a4f85a2a7f6f65 100644 (file)
--- 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,