Merge pull request #301 from bastelfreak/apache

Fix depreciation introduced by puppetlabs/puppetlabs-apache#1884
voxpupuli · Oct 5, 2020 · f2b46b3 · f2b46b3
2 parents e6a6d45 + 6164d75
commit f2b46b3
Showing 1 changed file with 20 additions and 21 deletions.
diff --git a/manifests/apache/vhost.pp b/manifests/apache/vhost.pp
@@ -100,21 +100,21 @@
   Optional[String] $ldap_require_group_dn   = undef,
   Stdlib::Absolutepath $virtualenv_dir      = $puppetboard::params::virtualenv_dir,
   Hash $custom_apache_parameters            = {},
-  Hash $wsgi_daemon_process_options_extra   = {},
 ) inherits puppetboard::params {
   $docroot = "${basedir}/puppetboard"
 
   $wsgi_script_aliases = {
     "${wsgi_alias}" => "${docroot}/wsgi.py",
   }
 
-  $wsgi_daemon_process_options_default = {
-    threads     => $threads,
-    group       => $group,
-    user        => $user,
-    python-home => $virtualenv_dir,
+  $wsgi_daemon_process = {
+    $user => {
+      threads     => $threads,
+      group       => $group,
+      user        => $user,
+      python-home => $virtualenv_dir,
+    },
   }
-  $wsgi_daemon_process_options = merge($wsgi_daemon_process_options_default, $wsgi_daemon_process_options_extra)
 
   file { "${docroot}/wsgi.py":
     ensure  => file,
@@ -145,20 +145,19 @@
     $ldap_require = undef
   }
   ::apache::vhost { $vhost_name:
-    port                        => $port,
-    docroot                     => $docroot,
-    ssl                         => $ssl,
-    ssl_cert                    => $ssl_cert,
-    ssl_key                     => $ssl_key,
-    additional_includes         => $ldap_additional_includes,
-    wsgi_daemon_process         => $user,
-    wsgi_process_group          => $group,
-    wsgi_script_aliases         => $wsgi_script_aliases,
-    wsgi_daemon_process_options => $wsgi_daemon_process_options,
-    override                    => $override,
-    require                     => [File["${docroot}/wsgi.py"], $ldap_require],
-    notify                      => Service[$puppetboard::params::apache_service],
-    *                           => $custom_apache_parameters,
+    port                => $port,
+    docroot             => $docroot,
+    ssl                 => $ssl,
+    ssl_cert            => $ssl_cert,
+    ssl_key             => $ssl_key,
+    additional_includes => $ldap_additional_includes,
+    wsgi_daemon_process => $wsgi_daemon_process,
+    wsgi_process_group  => $group,
+    wsgi_script_aliases => $wsgi_script_aliases,
+    override            => $override,
+    require             => [File["${docroot}/wsgi.py"], $ldap_require],
+    notify              => Service[$puppetboard::params::apache_service],
+    *                   => $custom_apache_parameters,
   }
   File["${basedir}/puppetboard/settings.py"] ~> Service['httpd']
 }