From f6603e777b2efbf560dea061695fa6edb1c638d0 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Mon, 4 Sep 2023 11:52:36 +0200
Subject: [PATCH] move apache backend (passenger) to a dedicated hash

---
 puppet/modules/redmine/manifests/init.pp | 38 +++++++++++++-----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/puppet/modules/redmine/manifests/init.pp b/puppet/modules/redmine/manifests/init.pp
index 34cfed0ec..2722b9389 100644
--- a/puppet/modules/redmine/manifests/init.pp
+++ b/puppet/modules/redmine/manifests/init.pp
@@ -157,10 +157,14 @@
   include web::base
 
   $docroot          = "${app_root}/public"
-  $min_instances    = 1
-  $start_timeout    = 600
   $priority         = '05'
 
+  $apache_backend_config = {
+    passenger_app_root      => $app_root,
+    passenger_min_instances => 1,
+    passenger_start_timeout => 600,
+  }
+
   apache::vhost { $servername:
     docroot        => $docroot,
     manage_docroot => false,
@@ -179,24 +183,22 @@
     }
 
     apache::vhost { "${servername}-https":
-      add_default_charset     => 'UTF-8',
-      docroot                 => $docroot,
-      manage_docroot          => false,
-      port                    => 443,
-      options                 => ['SymLinksIfOwnerMatch'],
-      passenger_app_root      => $app_root,
-      passenger_min_instances => $min_instances,
-      passenger_start_timeout => $start_timeout,
-      priority                => $priority,
-      servername              => $servername,
-      ssl                     => true,
-      ssl_cert                => "/etc/letsencrypt/live/${servername}/fullchain.pem",
-      ssl_chain               => "/etc/letsencrypt/live/${servername}/chain.pem",
-      ssl_key                 => "/etc/letsencrypt/live/${servername}/privkey.pem",
-      headers                 => [
+      add_default_charset => 'UTF-8',
+      docroot             => $docroot,
+      manage_docroot      => false,
+      port                => 443,
+      options             => ['SymLinksIfOwnerMatch'],
+      priority            => $priority,
+      servername          => $servername,
+      ssl                 => true,
+      ssl_cert            => "/etc/letsencrypt/live/${servername}/fullchain.pem",
+      ssl_chain           => "/etc/letsencrypt/live/${servername}/chain.pem",
+      ssl_key             => "/etc/letsencrypt/live/${servername}/privkey.pem",
+      headers             => [
         'set Strict-Transport-Security: max-age=15778800;',
       ],
-      require                 => [Letsencrypt::Certonly[$servername], Exec['install redmine']],
+      require             => [Letsencrypt::Certonly[$servername], Exec['install redmine']],
+      *                   => $apache_backend_config,
     }
   }