From 79ed057099a5991ea6228dc567a9222feb47c9b9 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sat, 23 Apr 2016 14:05:40 +0200 Subject: [PATCH] buildd: provide sbuild.conf with ASPCUD criteria Signed-off-by: Aurelien Jarno --- modules/buildd/files/sbuild.conf | 7 +++++++ modules/buildd/manifests/init.pp | 4 ++++ modules/samhain/templates/samhainrc.erb | 1 + 3 files changed, 12 insertions(+) create mode 100644 modules/buildd/files/sbuild.conf diff --git a/modules/buildd/files/sbuild.conf b/modules/buildd/files/sbuild.conf new file mode 100644 index 000000000..c9b3ed723 --- /dev/null +++ b/modules/buildd/files/sbuild.conf @@ -0,0 +1,7 @@ +## +## 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 +## + +# ASPCUD optimization criteria for experimental +aspcud_criteria='-removed,-changed,-new,-count(solution,APT-Release:=/experimental/)'; diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index b8afcd530..78bf62c85 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -30,6 +30,10 @@ class buildd ($ensure=present) { source => 'puppet:///modules/buildd/buildd.conf', require => Package['buildd'], } + file { '/etc/sbuild/sbuild.conf': + source => 'puppet:///modules/buildd/sbuild.conf', + require => Package['sbuild'], + } include ferm::ftp_conntrack } diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 812a4357d..556ab2033 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -241,6 +241,7 @@ file=/etc/resolv.conf <% if scope.lookupvar('site::nodeinfo')['buildd'] -%> file=/etc/dupload.conf file=/etc/buildd/buildd.conf +file=/etc/sbuild/sbuild.conf <% end -%> file=/etc/resolv.conf.pcmcia.save file=/etc/nologin -- 2.20.1