From 2d41a8963f7303b6a78a5432658ce7e93b145cce Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 10 Dec 2014 20:52:53 +0100 Subject: [PATCH] Add /etc/schroot/buildd/config with CHROOT_FILE_UNPACK_DIR=/srv/buildd/unpack if /srv/buildd exists --- modules/debian-org/lib/facter/paths.rb | 9 +++++++++ modules/schroot/manifests/init.pp | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/modules/debian-org/lib/facter/paths.rb b/modules/debian-org/lib/facter/paths.rb index e48fb600f..b8b7b0641 100644 --- a/modules/debian-org/lib/facter/paths.rb +++ b/modules/debian-org/lib/facter/paths.rb @@ -16,6 +16,15 @@ Facter.add("has_srv_buildd") do end end end +Facter.add("has_srv_buildd") do + setcode do + if FileTest.exist?("/srv/buildd") + true + else + '' + end + end +end Facter.add("has_etc_ssh_ssh_host_ed25519_key") do setcode do if FileTest.exist?("/etc/ssh/ssh_host_ed25519_key") diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp index d9ca26141..1716fbbed 100644 --- a/modules/schroot/manifests/init.pp +++ b/modules/schroot/manifests/init.pp @@ -62,4 +62,11 @@ class schroot { content => template('schroot/schroot-buildd/fstab.erb'), require => Package['schroot'], } + + if $has_srv_buildd { + file { '/etc/schroot/buildd/config': + content => "CHROOT_FILE_UNPACK_DIR=/srv/buildd/unpack", + require => Package['schroot'], + } + } } -- 2.20.1