projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new style porterbox: agricola
[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
ad592d7
..
efe91db
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-20,11
+20,9
@@
class debian-org {
'dsa-munin-plugins',
]:
ensure => installed,
'dsa-munin-plugins',
]:
ensure => installed,
- require => [
- File['/etc/apt/sources.list.d/db.debian.org.list'],
- Exec['apt-get update']
- ]
+ tag => extra_repo,
}
}
+
package { [
'apt-utils',
'bash-completion',
package { [
'apt-utils',
'bash-completion',
@@
-40,7
+38,7
@@
class debian-org {
}
if $::lsbmajdistrelease >= 7 {
}
if $::lsbmajdistrelease >= 7 {
- package { 'libfilesystem-ruby1.9':
+ package { 'libfilesystem-ruby1.9
.1
':
ensure => installed,
}
}
ensure => installed,
}
}
@@
-68,10
+66,7
@@
class debian-org {
if getfromhash($site::nodeinfo, 'broken-rtc') {
package { 'fake-hwclock':
ensure => installed,
if getfromhash($site::nodeinfo, 'broken-rtc') {
package { 'fake-hwclock':
ensure => installed,
- require => [
- File['/etc/apt/sources.list.d/db.debian.org.list'],
- Exec['apt-get update']
- ]
+ tag => extra_repo,
}
}
}
}
@@
-236,6
+231,7
@@
class debian-org {
path => '/usr/bin:/usr/sbin:/bin:/sbin',
refreshonly => true,
}
path => '/usr/bin:/usr/sbin:/bin:/sbin',
refreshonly => true,
}
+ Exec['apt-get update']->Package<| tag == extra_repo |>
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',