X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=b5ec5806c63fa17a11d34c1dbddd8acb1ee99e16;hb=f9797fa6bda42f46b013a41163ca04bf092d416b;hp=24a2f82fad4723c106859391926a8f8003637c1a;hpb=0f7bdd57ac350637b57a7985878439c0fa0c0a08;p=mirror%2Fdsa-puppet.git diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index 24a2f82fa..b5ec5806c 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -1,27 +1,34 @@ class buildd { - package { - "sbuild": ensure => installed; - "buildd": ensure => installed; - "buildd-builder-meta": ensure => installed; - "apt-transport-https": ensure => installed; - "debootstrap": ensure => installed; - } - - file { - "/etc/apt/sources.list.d/buildd.list": - source => template("buildd/etc/apt/sources.list.d/buildd.list.erb"), + package { + "sbuild": ensure => installed; + "buildd": ensure => installed; + "buildd-builder-meta": ensure => installed; + "apt-transport-https": ensure => installed; + "debootstrap": ensure => installed; + } + + file { + "/etc/apt/sources.list.d/buildd.list": + content => template("buildd/etc/apt/sources.list.d/buildd.list.erb"), require => Package["apt-transport-https"], notify => Exec["apt-get update"], ; - - "/etc/apt/trusted-keys.d/buildd.debian.org.asc": - source => "puppet:///buildd/buildd.debian.org.asc", - mode => 664, - notify => Exec["apt-keys-update"], - ; - "/etc/schroot/mount-defaults": - source => "puppet:///buildd/mount-defaults", - require => Package["sbuild"] - ; - } + + "/etc/apt/trusted-keys.d/buildd.debian.org.asc": + source => "puppet:///modules/buildd/buildd.debian.org.asc", + mode => 664, + notify => Exec["apt-keys-update"], + ; + "/etc/schroot/mount-defaults": + source => "puppet:///modules/buildd/mount-defaults", + require => Package["sbuild"] + ; + "/etc/cron.d/dsa-buildd": + source => "puppet:///modules/buildd/cron.d-dsa-buildd", + require => Package["cron"] + ; + } } +# vim:set et: +# vim:set sts=4 ts=4: +# vim:set shiftwidth=4: