From 7eae75a4704a899cbc000802122763eb5a02ae65 Mon Sep 17 00:00:00 2001
From: ynerant <ynerant@crans.org>
Date: Wed, 17 Feb 2021 20:24:38 +0100
Subject: [PATCH] [gitlab] Enable local nginx server, don't server HTTPS port
Signed-off-by: ynerant <ynerant@crans.org>
---
roles/gitlab/templates/gitlab.rb.j2 | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/roles/gitlab/templates/gitlab.rb.j2 b/roles/gitlab/templates/gitlab.rb.j2
index 7e9d1283..8f8f41c5 100644
--- a/roles/gitlab/templates/gitlab.rb.j2
+++ b/roles/gitlab/templates/gitlab.rb.j2
@@ -1287,7 +1287,7 @@ gitlab_rails['omniauth_providers'] = [
##! When bundled nginx is disabled we need to add the external webserver user to
##! the GitLab webserver group.
-web_server['external_users'] = ['www-data']
+# web_server['external_users'] = []
# web_server['username'] = 'gitlab-www'
# web_server['group'] = 'gitlab-www'
# web_server['uid'] = nil
@@ -1300,7 +1300,7 @@ web_server['external_users'] = ['www-data']
##! Docs: https://docs.gitlab.com/omnibus/settings/nginx.html
################################################################################
-nginx['enable'] = false
+# nginx['enable'] = true
# nginx['client_max_body_size'] = '250m'
# nginx['redirect_http_to_https'] = false
# nginx['redirect_http_to_https_port'] = 80
@@ -1345,11 +1345,11 @@ nginx['enable'] = false
##! **Override only if you use a reverse proxy**
##! Docs: https://docs.gitlab.com/omnibus/settings/nginx.html#setting-the-nginx-listen-port
-# nginx['listen_port'] = nil
+nginx['listen_port'] = 8000
##! **Override only if your reverse proxy internally communicates over HTTP**
##! Docs: https://docs.gitlab.com/omnibus/settings/nginx.html#supporting-proxied-ssl
-# nginx['listen_https'] = nil
+nginx['listen_https'] = false
# nginx['custom_gitlab_server_config'] = "location ^~ /foo-namespace/bar-project/raw/ {\n deny all;\n}\n"
# nginx['custom_nginx_config'] = "include /etc/nginx/conf.d/example.conf;"
@@ -2159,7 +2159,7 @@ grafana['enable'] = false
################################################################################
# Let's Encrypt integration
################################################################################
-# letsencrypt['enable'] = nil
+letsencrypt['enable'] = false
# letsencrypt['contact_emails'] = [] # This should be an array of email addresses to add as contacts
# letsencrypt['group'] = 'root'
# letsencrypt['key_size'] = 2048
--
GitLab