projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
schroot does not depend on the db.d.o repository. do not put schroot on hold for...
[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
bdb6df5
..
7dc5f73
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-13,14
+13,22
@@
class debian-org {
'sysklogd',
'rsyslog',
]:
'sysklogd',
'rsyslog',
]:
- ensure => purged,
+ ensure => purged,
+ }
+ package { [
+ 'debian.org',
+ 'dsa-munin-plugins',
+ ]:
+ ensure => installed,
+ require => [
+ File['/etc/apt/sources.list.d/db.debian.org.list'],
+ Exec['apt-get update']
+ ]
}
package { [
'apt-utils',
'bash-completion',
}
package { [
'apt-utils',
'bash-completion',
- 'debian.org',
'dnsutils',
'dnsutils',
- 'dsa-munin-plugins',
'less',
'lsb-release',
'libfilesystem-ruby1.8',
'less',
'lsb-release',
'libfilesystem-ruby1.8',
@@
-29,7
+37,7
@@
class debian-org {
'nload',
'pciutils',
]:
'nload',
'pciutils',
]:
-
ensure => installed,
+ ensure => installed,
}
munin::check { [
}
munin::check { [
@@
-54,7
+62,11
@@
class debian-org {
if getfromhash($site::nodeinfo, 'broken-rtc') {
package { 'fake-hwclock':
if getfromhash($site::nodeinfo, 'broken-rtc') {
package { 'fake-hwclock':
- ensure => installed
+ ensure => installed,
+ require => [
+ File['/etc/apt/sources.list.d/db.debian.org.list'],
+ Exec['apt-get update']
+ ]
}
}
}
}
@@
-169,6
+181,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,
@@
-177,7
+192,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',