diff --git a/changelogs/unreleased/deps-daa24eb-9910470.yml b/changelogs/unreleased/deps-daa24eb-9910470.yml new file mode 100644 index 0000000000000000000000000000000000000000..8b0c6e817cdeed5a7b795eacb459093cc2f645ee_Y2hhbmdlbG9ncy91bnJlbGVhc2VkL2RlcHMtZGFhMjRlYi05OTEwNDcwLnltbA== --- /dev/null +++ b/changelogs/unreleased/deps-daa24eb-9910470.yml @@ -0,0 +1,5 @@ +--- +title: Update logrotate version to 3.16.0 +merge_request: 3961 +author: +type: other diff --git a/config/software/logrotate.rb b/config/software/logrotate.rb index 95ad4623a7a4154534b17b4ea6e1b06229b78abf_Y29uZmlnL3NvZnR3YXJlL2xvZ3JvdGF0ZS5yYg==..8b0c6e817cdeed5a7b795eacb459093cc2f645ee_Y29uZmlnL3NvZnR3YXJlL2xvZ3JvdGF0ZS5yYg== 100644 --- a/config/software/logrotate.rb +++ b/config/software/logrotate.rb @@ -15,7 +15,7 @@ # name 'logrotate' -version = Gitlab::Version.new(name, '3.15.1') +version = Gitlab::Version.new(name, '3.16.0') default_version version.print(false) license 'GPL-2.0' diff --git a/files/gitlab-cookbooks/gitlab/libraries/logrotate_helper.rb b/files/gitlab-cookbooks/gitlab/libraries/logrotate_helper.rb index 95ad4623a7a4154534b17b4ea6e1b06229b78abf_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvbGlicmFyaWVzL2xvZ3JvdGF0ZV9oZWxwZXIucmI=..8b0c6e817cdeed5a7b795eacb459093cc2f645ee_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvbGlicmFyaWVzL2xvZ3JvdGF0ZV9oZWxwZXIucmI= 100644 --- a/files/gitlab-cookbooks/gitlab/libraries/logrotate_helper.rb +++ b/files/gitlab-cookbooks/gitlab/libraries/logrotate_helper.rb @@ -24,7 +24,7 @@ # to add a service here. # https://gitlab.com/gitlab-org/omnibus-gitlab/issues/4606 { - 'alertmanager' => { username: prometheus_user, group: 'root' }, + 'alertmanager' => { username: prometheus_user, group: prometheus_user }, 'consul' => { username: consul_user, group: consul_group }, 'crond' => { username: 'root', group: 'root' }, 'geo-logcursor' => { username: gitlab_user, group: gitlab_group }, @@ -39,7 +39,7 @@ 'logrotate' => { username: 'root', group: 'root' }, 'mailroom' => { username: gitlab_user, group: gitlab_group }, 'mattermost' => { username: mattermost_user, group: mattermost_group }, - 'nginx' => { username: 'root', group: web_server_group }, + 'nginx' => { username: 'root', group: 'root' }, 'node-exporter' => { username: prometheus_user, group: prometheus_group }, 'pgbouncer' => { username: postgresql_user, group: postgresql_group }, 'pgbouncer-exporter' => { username: postgresql_user, group: postgresql_group },