Automatic merge of gitlab-org/omnibus-gitlab master

Author: GitLab Bot

config/software/pgbouncer.rb

@@ -15,7 +15,7 @@
 #
 
 name 'pgbouncer'
-version = Gitlab::Version.new('pgbouncer', 'pgbouncer_1_18_0')
+version = Gitlab::Version.new('pgbouncer', 'pgbouncer_1_21_0')
 default_version version.print(false)
 
 license 'ISC'

doc/settings/ssl/index.md

@@ -104,6 +104,17 @@ The certificate is renewed only if it expires in 30 days.
 For example, if you set it to renew on the 1st of every month at 00:00 and the
 certificate expires on the 31st, then the certificate will expire before it's renewed.
 
+Automatic renewals are managed with [go-crond](https://github.com/webdevops/go-crond).
+If wanted, one can pass [CLI arguments](https://github.com/webdevops/go-crond#usage) to
+go-crond by editing the `/etc/gitlab/gitlab.rb`:
+
+```ruby
+crond['flags'] = {
+  'log.json' = true,
+  'server.bind' = ':8040'
+}
+```
+
 To disable the automatic renewal:
 
 1. Edit `/etc/gitlab/gitlab.rb`:

files/gitlab-config-template/gitlab.rb.template

@@ -3209,7 +3209,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # patroni['tls_verify'] = true
 
 ################################################################################
-# Consul (EEP only)
+# Consul (EE only)
 ################################################################################
 # consul['enable'] = false
 # consul['dir'] = '/var/opt/gitlab/consul'
@@ -3327,7 +3327,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 #### encoded with base64
 # gitlab_rails['service_desk_email_auth_token'] = nil
 
-################################################################################
+#################################################################################
 ## Spamcheck (EE only)
 #################################################################################
 
@@ -3349,3 +3349,10 @@ external_url 'GENERATED_EXTERNAL_URL'
 #   'SSL_CERT_DIR' => '/opt/gitlab/embedded/ssl/cers'
 # }
 # spamcheck['classifier']['log_directory'] = "/var/log/gitlab/spam-classifier"
+
+#################################################################################
+## (Go-)Crond
+#################################################################################
+# crond['log_directory'] = '/var/log/gitlab/crond'
+# crond['cron_d'] = '/var/opt/gitlab/crond'
+# crond['flags'] = {}

files/gitlab-cookbooks/crond/attributes/default.rb

@@ -1,3 +1,4 @@
 default['crond']['enable'] = false
 default['crond']['log_directory'] = '/var/log/gitlab/crond'
 default['crond']['cron_d'] = '/var/opt/gitlab/crond'
+default['crond']['flags'] = {}

files/gitlab-cookbooks/crond/libraries/crond_helper.rb

@@ -0,0 +1,27 @@
+require 'shellwords'
+
+class CrondHelper
+  attr_reader :node
+
+  def initialize(node)
+    @node = node
+  end
+
+  def flags
+    config = []
+
+    node['crond']['flags'].each do |flag_key, flag_value|
+      next if flag_key == 'include' || flag_value == false
+
+      config << if flag_value == true
+                  "--#{flag_key}"
+                elsif !flag_value.empty?
+                  "--#{flag_key}=#{Shellwords.escape(flag_value)}"
+                end
+    end
+
+    config << "--include=#{Shellwords.escape(node['crond']['cron_d'])}"
+
+    config.join(" ")
+  end
+end

files/gitlab-cookbooks/crond/recipes/enable.rb

@@ -20,11 +20,13 @@
   owner "root"
 end
 
+crond_flags = CrondHelper.new(node).flags
+
 runit_service "crond" do
   owner "root"
   group "root"
   options({
-    cron_d: node['crond']['cron_d'],
+    flags: crond_flags,
     log_directory: logging_settings[:log_directory],
     log_user: logging_settings[:runit_owner],
     log_group: logging_settings[:runit_group]

files/gitlab-cookbooks/crond/templates/default/sv-crond-run.erb

@@ -6,4 +6,4 @@ exec 2>&1
 
 exec chpst -P \
   /opt/gitlab/embedded/bin/go-crond \
-    --include=<%= @options[:cron_d] %>
+    <%= @options[:flags] %>

spec/chef/cookbooks/crond/recipes/crond_enable_spec.rb

@@ -20,6 +20,32 @@
 
   it_behaves_like "enabled runit service", "crond", "root", "root"
 
+  context 'custom flags' do
+    before do
+      stub_gitlab_rb(
+        crond: {
+          enable: true,
+          flags: {
+            'verbose': true,
+            'auto': false,
+            'log-json': true,
+            'default-user': 'user'
+          }
+        }
+      )
+    end
+
+    it "should pass correct options to runit_service" do
+      expect(chef_run).to render_file("/opt/gitlab/sv/crond/run").with_content { |content|
+        expect(content).to match(/--include=\/var\/opt\/gitlab\/crond/)
+        expect(content).to match(/--default-user=user/)
+        expect(content).to match(/--log-json/)
+        expect(content).to match(/--verbose/)
+        expect(content).not_to match(/--auto/)
+      }
+    end
+  end
+
   context 'log directory and runit group' do
     context 'default values' do
       before do