From 1120fb3d0df58d09691d38e48ce4f4f2a4fe8a95 Mon Sep 17 00:00:00 2001
From: harbottle <harbottle@room3d3.com>
Date: Fri, 25 Feb 2022 11:16:24 +0000
Subject: [PATCH] Update gitlab.rb template with deprecated geo options

---
 templates/gitlab.rb.erb | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/templates/gitlab.rb.erb b/templates/gitlab.rb.erb
index 71df493..e63bad5 100644
--- a/templates/gitlab.rb.erb
+++ b/templates/gitlab.rb.erb
@@ -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 -%>
 
 ########################