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

Replace array merges using '+' with concat() from stdlib 

Puppet doesn't support variable reassignment, so using concat() from
the puppetlabs/stdlib seems to be easier than making up a series of
arbitrary variable names.
This commit is contained in:
Kienan Stewart 2017-03-24 18:32:22 -04:00
parent 0bd5a15637
commit 4f3feb6b94
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/hostmaster.pp
View File

@ -19,7 +19,7 @@ class aegir::hostmaster (
$drush_version = '' $drush_version = ''
) { ) {
include apt include apt
#include stdlib include stdlib
apt::source { 'aegir': apt::source { 'aegir':
location => 'http://debian.aegirproject.org', location => 'http://debian.aegirproject.org',
release => $release, release => $release,
@ -37,16 +37,16 @@ class aegir::hostmaster (
"${package_name}-hostmaster aegir/db_user string ${database['user']}" "${package_name}-hostmaster aegir/db_user string ${database['user']}"
] ]
if $email { if $email {
$debconf_settings = $debconf_settings + ["${package_name}-hostmaster aegir/email string ${email}"] concat($debconf_settings, ["${package_name}-hostmaster aegir/email string ${email}"])
} }
if $makefile { if $makefile {
$debconf_settings = $debconf_settings + ["${package_name}-hostmaster aegir/makefile string ${makefile}"] concat($debconf_settings, ["${package_name}-hostmaster aegir/makefile string ${makefile}"])
} }
if $working_copy { if $working_copy {
$debconf_settings = $debconf_settings + ["${package_name}-hostmaster aegir/working-copy boolean true"] concat($debconf_settings, ["${package_name}-hostmaster aegir/working-copy boolean true"])
} }
if $drush_version { if $drush_version {
$debconf_settings = $debconf_settings + ["aegir${version}-provision aegir/drush_version string ${drush_version}"] concat($debconf_settings, ["aegir${version}-provision aegir/drush_version string ${drush_version}"])
} }
file { '/etc/dpkg/aegir.response': file { '/etc/dpkg/aegir.response':
ensure => 'file', ensure => 'file',