Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update gitlab.rb template with deprecated geo options #399

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update gitlab.rb template with deprecated geo options #399

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions templates/gitlab.rb.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,28 +532,34 @@ gitaly['<%= k -%>'] = <%= decorate(@gitaly[k]) %>
<%- end end -%>
<%- if @geo_primary_role -%>

#####################
# Gitlab Geo Primary#
#####################
## To configure Gitlab Geo, refer below section.
## https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template#L1459

########################################
# GitLab Geo Primary Role (deprecated) #
########################################
## geo_primary_role['enable'] is deprecated
## Geo roles 'geo_primary_role' and 'geo_secondary_role' are set above with
## other roles. For more information, see: https://docs.gitlab.com/omnibus/roles/README.html#roles
geo_primary_role['enable'] = true
<%- end -%>
<%- if @geo_secondary_role -%>

##########################################
# GitLab Geo Secondary Role (deprecated) #
##########################################
## geo_secondary_role['enable'] is deprecated
## Geo roles 'geo_primary_role' and 'geo_secondary_role' are set above with
## other roles. For more information, see: https://docs.gitlab.com/omnibus/roles/README.html#roles
geo_secondary_role['enable'] = true
<%- end -%>
<%- if @geo_secondary -%>

#######################
# Gitlab Geo Secondary#
#######################
## To configure Gitlab Geo, refer below section.
## https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template#1463-L1481

geo_secondary_role['enable'] = true
<%- if @geo_secondary -%>
<%- @geo_secondary.keys.sort.each do |k| -%>
geo_secondary['<%= k -%>'] = <%= decorate(@geo_secondary[k]) %>
<%- end end -%>
<%- end -%>
<%- if @geo_postgresql -%>

########################
Expand Down