projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Package[] must not depend on apt-get update, that will cause loops
[mirror/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
9da7de5
..
912cfd6
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':
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':
}
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':
}
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':
}
}
site::aptrepo { 'backports.org':
@@
-82,8
+82,8
@@
class debian-org {
}
site::aptrepo { 'db.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':
}
file { '/etc/facter':
@@
-137,6
+137,10
@@
class debian-org {
require => Package['debian.org'],
content => template('debian-org/pam.common-session.erb'),
}
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',
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 { 'editor':
linkto => '/usr/bin/vim.basic',
}
+ site::alternative { 'view':
+ linkto => '/usr/bin/vim.basic',
+ }
mailalias { 'samhain-reports':
ensure => present,
recipient => $debianadmin,
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,
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',
exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
path => '/usr/bin:/usr/sbin:/bin:/sbin',