From 48eabf9dee738679b9955e2d5c5620e237d46958 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Sat, 25 Mar 2017 22:59:41 -0400 Subject: [PATCH] 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 --- manifests/hostmaster.pp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/manifests/hostmaster.pp b/manifests/hostmaster.pp index 4fca39e..2f71716 100644 --- a/manifests/hostmaster.pp +++ b/manifests/hostmaster.pp @@ -67,12 +67,20 @@ class aegir::hostmaster ( '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': - ensure => 'installed', - name => $package_name, - responsefile => '/etc/dpkg/aegir.response', - require => [ + ensure => 'installed', + name => $package_name, + responsefile => '/etc/dpkg/aegir.response', + install_options => $install_options, + require => [ Apt::Source['aegir'], Class['apt::update'], File['/etc/dpkg/aegir.response']