From ddf1f08dd841ebbb9c8f39c01ad5036e7ea54950 Mon Sep 17 00:00:00 2001
From: Alexander Meindl <a.meindl@alphanodes.com>
Date: Tue, 19 Mar 2024 18:24:12 +0100
Subject: [PATCH] working on nginx ipv6

---
 roles/gitlab_omnibus/defaults/main.yml      | 4 ++++
 roles/gitlab_omnibus/templates/gitlab.rb.j2 | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/roles/gitlab_omnibus/defaults/main.yml b/roles/gitlab_omnibus/defaults/main.yml
index a1b7ffa..2ef9963 100644
--- a/roles/gitlab_omnibus/defaults/main.yml
+++ b/roles/gitlab_omnibus/defaults/main.yml
@@ -28,6 +28,10 @@ gitlab_backup_pg_schema: public
 gitlab_backup_archive_permissions: '0644'
 gitlab_backup_keep_time: 604800
 
+gitlab_nginx_listen_addresses:
+  - '*'
+  - '[::]'
+
 # Passthrough all downloads via GitLab instead of using Redirects to Object Storage.
 # ? https://docs.gitlab.com/ee/administration/object_storage.html#proxy-download
 gitlab_object_store_proxy_download: true
diff --git a/roles/gitlab_omnibus/templates/gitlab.rb.j2 b/roles/gitlab_omnibus/templates/gitlab.rb.j2
index b445252..e7e0f55 100644
--- a/roles/gitlab_omnibus/templates/gitlab.rb.j2
+++ b/roles/gitlab_omnibus/templates/gitlab.rb.j2
@@ -962,7 +962,7 @@ gitlab_rails['backup_keep_time'] = {{ gitlab_backup_keep_time }}
 ##! Docs: https://docs.gitlab.com/ee/administration/packages/container_registry.html
 ################################################################################
 
-# registry_external_url 'https://registry.example.com'
+#registry_external_url 'https://registry.example.com'
 
 ### Settings used by GitLab application
 # gitlab_rails['registry_enabled'] = true
@@ -1708,7 +1708,7 @@ nginx['ssl_protocols'] = "TLSv1.3"
 
 # nginx['ssl_dhparam'] = nil # Path to dhparams.pem, eg. /etc/gitlab/ssl/dhparams.pem
 # nginx['ssl_password_file'] = nil # Path to file with passphrases for ssl certificate secret keys
-# nginx['listen_addresses'] = ['*', '[::]']
+nginx['listen_addresses'] = {{ gitlab_nginx_listen_addresses | to_json }}
 
 ##! **Defaults to forcing web browsers to always communicate using only HTTPS**
 ##! Docs: https://docs.gitlab.com/omnibus/settings/nginx.html#setting-http-strict-transport-security