From f1fc7573cb9bad243277849f51a495cb6916ad2b Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Sun, 26 Mar 2017 00:31:29 -0400 Subject: [PATCH] Change conditions on setting debconf preseeds for aegir Apparently in Puppet, empty strings resolve to true. Liens were being added to the preseed that caused installations to fail (eg. empty aegir_root). --- manifests/hostmaster.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/hostmaster.pp b/manifests/hostmaster.pp index 7b3faaf..f318211 100644 --- a/manifests/hostmaster.pp +++ b/manifests/hostmaster.pp @@ -37,13 +37,13 @@ class aegir::hostmaster ( "${package_name}-hostmaster aegir/db_user string ${database['user']}", "${package_name}-hostmaster aegir/webserver select ${server}", ] - if $email { + if $email != '' { $debconf_email = ["${package_name}-hostmaster aegir/email string ${email}"] } else { $debconf_email = [] } - if $makefile { + if $makefile != '' { $debconf_makefile = ["${package_name}-hostmaster aegir/makefile string ${makefile}"] } else { @@ -55,7 +55,7 @@ class aegir::hostmaster ( else { $debconf_working_copy = [] } - if $drush_version { + if $drush_version != '' { $debconf_drush = ["${package_name}-provision aegir/drush_version string ${drush_version}"] } else {