fix: 🐛 fix CATALOG_PATH, minor settings, chore

cloud-pi-native · Jun 1, 2023 · c97cb3a · c97cb3a
1 parent 20ca5a0
commit c97cb3a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git 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
@@ -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