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']