Skip to content

Commit 73e9ad5

Browse files
committed
Replace git_data_dirs
Starting with GitLab 18.0 git_data_dirs will be removed. They need to be replaced according to: https://docs.gitlab.com/omnibus/settings/configuration/#migrating-from-git_data_dirs
1 parent 6da5204 commit 73e9ad5

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

roles/gitlab/templates/gitlab.rb.j2

+13-4
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,23 @@ gitlab_rails['redis_sentinels_password'] = "{{ gitlab_redis_sentinel_password }}
3131
gitlab_rails['monitoring_whitelist'] = ["{{ gitlab_ip_range }}"]
3232

3333
{% if gitlab_use_internal_gitaly %}
34-
git_data_dirs({"default" => {"path" => "{{ gitlab_git_data_dir }}"} })
34+
gitaly['configuration'] = {
35+
"storage": [
36+
{
37+
"name": "default",
38+
"path": "{{ (gitlab_git_data_dir, 'repositories') | path_join }}",
39+
},
40+
],
41+
}
3542
{% else %}
3643
gitaly['enable'] = false
3744
gitlab_rails['gitaly_token'] = "{{ gitlab_gitaly_token }}"
3845
gitlab_shell['secret_token'] = "{{ gitlab_secret_token }}"
39-
git_data_dirs({
40-
'default' => { 'gitaly_address' => 'tcp://{{ gitlab_gitaly_instance_ip }}:{{ gitlab_gitaly_instance_port }}' },
41-
})
46+
gitlab_rails['repositories_storages'] = {
47+
"default" => {
48+
"gitaly_address" => "tcp://{{ gitlab_gitaly_instance_ip }}:{{ gitlab_gitaly_instance_port }}"
49+
}
50+
}
4251
{% endif %}
4352

4453
gitlab_rails['gitlab_email_enabled'] = {{ gitlab_email_enabled }}

0 commit comments

Comments
 (0)