X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=efe91dbca428e5c5cbf2bea6eedc31054092ba51;hb=16e295d6dcd715d959e2fad2cf0e25ba2938058e;hp=4d7d63f20cfe54b1fcdbabd26c05a5cbcbd45171;hpb=8fd87401b5b7cb84eba0b83c17d07fddb2465d6d;p=mirror%2Fdsa-puppet.git diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 4d7d63f20..efe91dbca 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -20,6 +20,7 @@ class debian-org { 'dsa-munin-plugins', ]: ensure => installed, + tag => extra_repo, } package { [ @@ -37,7 +38,7 @@ class debian-org { } if $::lsbmajdistrelease >= 7 { - package { 'libfilesystem-ruby1.9': + package { 'libfilesystem-ruby1.9.1': ensure => installed, } } @@ -65,6 +66,7 @@ class debian-org { if getfromhash($site::nodeinfo, 'broken-rtc') { package { 'fake-hwclock': ensure => installed, + tag => extra_repo, } } @@ -229,7 +231,7 @@ class debian-org { path => '/usr/bin:/usr/sbin:/bin:/sbin', refreshonly => true, } - Exec['apt-get update']->Package<| |> + Exec['apt-get update']->Package<| tag == extra_repo |> exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive': path => '/usr/bin:/usr/sbin:/bin:/sbin',