X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=16f844155a332d74bb0164ebbd8f0a907514d5e0;hb=6fa2680c82607d511aa6933a7b1e010e78b42860;hp=7977b11ad80b2a9cbe1af839a8aced895beb43ed;hpb=29391766483f14c896ba705c9fe657bc88c8d76e;p=mirror%2Fdsa-puppet.git diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index 7977b11ad..16f844155 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 => "puppet:///files/etc/apt/sources.list.d/buildd.list", + 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:///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/cron.d/dsa-buildd": + source => "puppet:///buildd/cron.d-dsa-buildd", + require => Package["cron"] + ; + } } +# vim:set et: +# vim:set sts=4 ts=4: +# vim:set shiftwidth=4: