various small changes to the redmine module

puppet/modules/redmine/manifests/init.pp

@@ -30,6 +30,7 @@
   Stdlib::Absolutepath $data_dir = '/var/lib/redmine',
   String $servername             = 'projects.theforeman.org',
   Stdlib::Httpsurl $repo_url     = 'https://github.com/theforeman/redmine',
+  Optional[String] $repo_branch  = undef,
   String $username               = 'redmine',
   String $db_name                = 'redmine',
   String $db_password            = extlib::cache_data('foreman_cache_data', 'db_password', extlib::random_password(32)),
@@ -38,14 +39,24 @@
   # PostgreSQL tuning
   $postgresql_settings = {
     'checkpoint_completion_target' => '0.9',
-    'checkpoint_segments'          => '20',
     'effective_cache_size'         => '2GB',
     'shared_buffers'               => '512MB',
     'work_mem'                     => '4MB',
   }
 
   # Needed for bundle install
+  if $facts['os']['release']['major'] == '8' {
+    package { 'ruby dnf module':
+      ensure      => '2.7',
+      name        => 'ruby',
+      enable_only => true,
+      provider    => 'dnfmodule',
+      before      => Package['rubygem-bundler.noarch', 'ruby-devel'],
+    }
+  }
+
   $packages = [
+    'git',
     'rubygem-bundler.noarch',
     'ruby-devel',
     'gcc',
@@ -54,6 +65,8 @@
     'ImageMagick-devel',
     'postgresql-devel',
     'sqlite-devel',
+    'redhat-rpm-config',
+    'make',
   ]
 
   ensure_packages($packages)
@@ -73,7 +86,7 @@
 
   postgresql::server::db { $db_name:
     user     => $username,
-    password => postgresql_password($username, $db_password),
+    password => postgresql::postgresql_password($username, $db_password),
     owner    => $username,
     encoding => 'utf8',
     locale   => 'en_US.utf8',
@@ -99,16 +112,24 @@
     content => template('redmine/secure_config.yaml.erb'),
   }
 
+  file { $app_root:
+    ensure => directory,
+    owner  => $username,
+  }
+
   vcsrepo { $app_root:
     ensure   => present,
     provider => 'git',
     source   => $repo_url,
+    revision => $repo_branch,
+    owner    => $username,
     user     => $username,
     notify   => Exec['install redmine'],
   }
 
+  # TODO: this should lay down a .bundle/config instead of using --path
   exec { 'install redmine':
-    command     => 'bundle install',
+    command     => 'bundle install --path ./vendor',
     user        => $username,
     cwd         => $app_root,
     path        => $::path,
@@ -138,15 +159,12 @@
   include web::base
 
   $docroot          = "${app_root}/public"
-  $min_instances    = 1
-  $start_timeout    = 600
   $priority         = '05'
 
-  letsencrypt::certonly { $servername:
-    plugin        => 'webroot',
-    domains       => [$servername],
-    webroot_paths => [$docroot],
-    require       => Vcsrepo[$app_root],
+  $apache_backend_config = {
+    passenger_app_root      => $app_root,
+    passenger_min_instances => 1,
+    passenger_start_timeout => 600,
   }
 
   apache::vhost { $servername:
@@ -159,25 +177,30 @@
   }
 
   if $https {
+    letsencrypt::certonly { $servername:
+      plugin        => 'webroot',
+      domains       => [$servername],
+      webroot_paths => [$docroot],
+      require       => Vcsrepo[$app_root],
+    }
+
     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,
     }
   }