Merge pull request #915 from voxpupuli/custom-vhost-params

allow specifying custom parameters to apache::vhost

Author: evgeni

REFERENCE.md

@@ -4984,6 +4984,7 @@ The following parameters are available in the `zabbix::web` class:
 * [`saml_settings`](#-zabbix--web--saml_settings)
 * [`puppetgem`](#-zabbix--web--puppetgem)
 * [`manage_selinux`](#-zabbix--web--manage_selinux)
+* [`apache_vhost_custom_params`](#-zabbix--web--apache_vhost_custom_params)
 
 ##### <a name="-zabbix--web--zabbix_url"></a>`zabbix_url`
 
@@ -5409,6 +5410,14 @@ Whether we should manage SELinux rules.
 
 Default value: `$zabbix::params::manage_selinux`
 
+##### <a name="-zabbix--web--apache_vhost_custom_params"></a>`apache_vhost_custom_params`
+
+Data type: `Hash[String[1], Any]`
+
+Additional parameters to pass to apache::vhost.
+
+Default value: `{}`
+
 ### <a name="zabbix--zabbixapi"></a>`zabbix::zabbixapi`
 
 This will install the zabbixapi gem.

manifests/web.pp

@@ -77,6 +77,7 @@
 # @param saml_settings A hash of additional SAML SSO settings.
 # @param puppetgem Provider for the zabbixapi gem package.
 # @param manage_selinux Whether we should manage SELinux rules.
+# @param apache_vhost_custom_params Additional parameters to pass to apache::vhost.
 # @example For multiple host setup:
 #   node 'wdpuppet02.dj-wasabi.local' {
 #     class { 'apache':
@@ -143,6 +144,7 @@
   Hash[String[1], Variant[ScalarData, Hash]] $saml_settings           = $zabbix::params::saml_settings,
   $puppetgem                                                          = $zabbix::params::puppetgem,
   Boolean $manage_selinux                                             = $zabbix::params::manage_selinux,
+  Hash[String[1], Any] $apache_vhost_custom_params                    = {},
 ) inherits zabbix::params {
   # check osfamily, Arch is currently not supported for web
   if $facts['os']['family'] in ['Archlinux', 'Gentoo',] {
@@ -417,6 +419,7 @@
       ssl_cipher      => $apache_ssl_cipher,
       ssl_chain       => $apache_ssl_chain,
       require         => Package[$zabbix_web_package],
+      *               => $apache_vhost_custom_params,
     }
   } # END if $manage_vhost
 

spec/classes/web_spec.rb

@@ -273,6 +273,16 @@ class { 'apache':
             )
           }
         end
+
+        describe 'with custom vhost params' do
+          let :params do
+            super().merge(
+              apache_vhost_custom_params: { mdomain: true }
+            )
+          end
+
+          it { is_expected.to contain_apache__vhost('zabbix.example.com').with_mdomain(true) }
+        end
       end
     end
   end