kienan
/
puppet-aegir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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).
This commit is contained in:
Kienan Stewart 2017-03-26 00:31:29 -04:00
parent c5b5a619d7
commit f1fc7573cb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/hostmaster.pp
View File

@ -37,13 +37,13 @@ class aegir::hostmaster (
"${package_name}-hostmaster aegir/db_user string ${database['user']}", "${package_name}-hostmaster aegir/db_user string ${database['user']}",
"${package_name}-hostmaster aegir/webserver select ${server}", "${package_name}-hostmaster aegir/webserver select ${server}",
] ]
if $email { if $email != '' {
$debconf_email = ["${package_name}-hostmaster aegir/email string ${email}"] $debconf_email = ["${package_name}-hostmaster aegir/email string ${email}"]
} }
else { else {
$debconf_email = [] $debconf_email = []
} }
if $makefile { if $makefile != '' {
$debconf_makefile = ["${package_name}-hostmaster aegir/makefile string ${makefile}"] $debconf_makefile = ["${package_name}-hostmaster aegir/makefile string ${makefile}"]
} }
else { else {
@ -55,7 +55,7 @@ class aegir::hostmaster (
else { else {
$debconf_working_copy = [] $debconf_working_copy = []
} }
if $drush_version { if $drush_version != '' {
$debconf_drush = ["${package_name}-provision aegir/drush_version string ${drush_version}"] $debconf_drush = ["${package_name}-provision aegir/drush_version string ${drush_version}"]
} }
else { else {