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

Pass nginx packages as extra arguments to aegir installation 

Installing aegir tries to use non-fpm php packages even if the
fpm package is already installed. Try to circumvent this behaviour
by passing the extra packages directly to the apt-get command as
suggested in the documentation.

@see https://aegir.readthedocs.io/en/3.x/install/#6-optional-install-with-nginx
This commit is contained in:
Kienan Stewart 2017-03-25 22:59:41 -04:00
parent a31948c67b
commit 48eabf9dee
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/hostmaster.pp
View File

@ -67,12 +67,20 @@ class aegir::hostmaster (
'before' => Package['aegir'], 'before' => Package['aegir'],
} }
) )
$install_options = join($nginx_packages)
} }
else {
$install_options = ''
}
# Pass in extra packages through install options for nginx support.
# Even with aegir/webserver set in preconfig, apt-get tries to install
# with phpX (not fpm).
package { 'aegir': package { 'aegir':
ensure => 'installed', ensure => 'installed',
name => $package_name, name => $package_name,
responsefile => '/etc/dpkg/aegir.response', responsefile => '/etc/dpkg/aegir.response',
require => [ install_options => $install_options,
require => [
Apt::Source['aegir'], Apt::Source['aegir'],
Class['apt::update'], Class['apt::update'],
File['/etc/dpkg/aegir.response'] File['/etc/dpkg/aegir.response']