From: Stephen Gran Date: Tue, 22 Sep 2009 23:01:16 +0000 (+0100) Subject: and move buildd list to its module X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0485bf5797d3a45c9bebcd9f1be9ec61b85f853c;p=dsa-puppet.git and move buildd list to its module Signed-off-by: Stephen Gran --- diff --git a/modules/buildd/etc/apt/sources.list.d/buildd.list.erb b/modules/buildd/etc/apt/sources.list.d/buildd.list.erb new file mode 100644 index 00000000..13831d05 --- /dev/null +++ b/modules/buildd/etc/apt/sources.list.d/buildd.list.erb @@ -0,0 +1,6 @@ +## +## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. +## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git +## + +deb https://buildd.debian.org/apt/ lenny main diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index 7977b11a..5a7c21b8 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -9,7 +9,7 @@ class buildd { file { "/etc/apt/sources.list.d/buildd.list": - source => "puppet:///files/etc/apt/sources.list.d/buildd.list", + source => template("buildd/etc/apt/sources.list.d/buildd.list"), require => Package["apt-transport-https"], notify => Exec["apt-get update"], ; diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/buildd.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/buildd.list.erb deleted file mode 100644 index 13831d05..00000000 --- a/modules/debian-org/templates/etc/apt/sources.list.d/buildd.list.erb +++ /dev/null @@ -1,6 +0,0 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## - -deb https://buildd.debian.org/apt/ lenny main