From c97cb3a4fd4cf7d4ffc5cc795d652d5268708558 Mon Sep 17 00:00:00 2001
From: ArnaudTA <atardif@adlere.fr>
Date: Fri, 2 Jun 2023 01:01:14 +0200
Subject: [PATCH] fix: :bug: fix CATALOG_PATH, minor settings, chore

---
 roles/gitlab/tasks/main.yaml                   |  6 +++---
 roles/gitlab/templates/gitlab-instance.yaml.j2 |  3 +++
 roles/gitlab/templates/provider.yaml.j2        | 16 ----------------
 3 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 roles/gitlab/templates/provider.yaml.j2

diff --git a/roles/gitlab/tasks/main.yaml b/roles/gitlab/tasks/main.yaml
index 5536a799..d6510581 100644
--- a/roles/gitlab/tasks/main.yaml
+++ b/roles/gitlab/tasks/main.yaml
@@ -164,8 +164,8 @@
       "PRIVATE-TOKEN": "{{ gitlab_token }}"
     body:
       signup_enabled: false
-      outbound_local_requests_whitelist: 
-        - "0.0.0.0/0"
+      outbound_local_requests_allowlist_raw: "0.0.0.0/0"
+      default_branch_protection: 0
     body_format: form-urlencoded
   changed_when: true
 
@@ -189,7 +189,7 @@
       - name: VAULT_KV
         value: forge-dso
       - name: CATALOG_PATH
-        value: "{{ projectsRootDir + 'catalog' | flatten | join('/') }}"
+        value: "{{ projectsRootDir | join('/') }}/catalog"
       - name: PROJECTS_ROOT_DIR
         value: "{{ projectsRootDir | join('/') }}"
       - name: "NEXUS_HOST_URL"
diff --git a/roles/gitlab/templates/gitlab-instance.yaml.j2 b/roles/gitlab/templates/gitlab-instance.yaml.j2
index 4c407440..f759898c 100644
--- a/roles/gitlab/templates/gitlab-instance.yaml.j2
+++ b/roles/gitlab/templates/gitlab-instance.yaml.j2
@@ -61,6 +61,9 @@ global:
 {% endif %}
   extraEnv:
 {% if USE_PROXY %}
+    http_proxy: {{ HTTP_PROXY }}
+    https_proxy: {{ HTTPS_PROXY }}
+    no_proxy: {{ NO_PROXY }}
     HTTP_PROXY: {{ HTTP_PROXY }}
     HTTPS_PROXY: {{ HTTPS_PROXY }}
     NO_PROXY: {{ NO_PROXY }}
diff --git a/roles/gitlab/templates/provider.yaml.j2 b/roles/gitlab/templates/provider.yaml.j2
deleted file mode 100644
index 46920539..00000000
--- a/roles/gitlab/templates/provider.yaml.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-name: openid_connect
-label: Keycloak
-args:
-  name: openid_connect
-  scope:
-    - openid
-    - generic
-  response_type: code
-  issuer: https://{{ KEYCLOAK_DOMAIN }}/auth/realms/dso
-  client_auth_method: query
-  discovery: true
-  uid_field: email
-  client_options:
-    identifier: gitlab-client
-    secret: 530169ec-83e6-430e-84d7-22c937dc789c
-    redirect_uri: https://{{ GITLAB_DOMAIN }}/users/auth/openid_connect/callback