chore: resolve merge conflict in .gitignore

.gitignore

@@ -24,6 +24,6 @@
 # Installation tracking
 .installed-version
 
-# Test deployments
-/tests/
+# Test outputs
+tests/
 config.yaml

library/compose/gitlab/compose.yaml.j2

@@ -15,11 +15,13 @@ services:
 {% if ports_enabled %}
     ports:
       - "{{ ports_http }}:80"
-      - "{{ ports_https }}:443"
-      - "{{ ssh_port }}:22"
+      - "{{ ports_ssh }}:22"
+      {% if registry_enabled %}
+      - "{{ ports_registry }}:5678"
+      {% endif %}
 {% else %}
     ports:
-      - "{{ ssh_port }}:22"
+      - "{{ ports_ssh }}:22"
 {% endif %}
 {% if traefik_enabled %}
     labels:

library/compose/gitlab/config/gitlab.rb.j2

@@ -4,13 +4,14 @@ external_url '{{ external_url }}'
 # GitLab Shell SSH settings
 gitlab_rails['gitlab_shell_ssh_port'] = {{ ssh_port }}
 
-# Let's Encrypt settings are currently not supported by the template
+# Let's Encrypt and built-in TLS settings are currently not supported by the template
+# as we are using Traefik as a reverse proxy
 letsencrypt['enable'] = false
-
-{% if traefik_enabled %}
-# Traefik settings
 nginx['listen_port']  = 80
 nginx['listen_https'] = false
+
+{% if traefik_tls_enabled %}
+# Traefik settings, to redirect http to https
 nginx['redirect_http_to_https'] = true
 {% endif %}
 
@@ -18,9 +19,7 @@ nginx['redirect_http_to_https'] = true
 # Container Registry settings
 registry_external_url '{{ registry_external_url }}'
 gitlab_rails['registry_enabled']  = true
-{% if traefik_enabled %}
 registry_nginx['listen_https']    = false
-{% endif %}
 registry_nginx['listen_port']     = {{ ports_registry }}
 {% endif %}
 

library/compose/gitlab/template.yaml

@@ -50,29 +50,21 @@ spec:
         default: "gitlab"
       external_url:
         type: str
-        description: External URL for GitLab (e.g., https://gitlab.example.com)
-        default: https://gitlab.example.com
-      ssh_port:
-        type: int
-        description: SSH port for Git operations
-        default: 2424
+        description: External URL for GitLab
+        default: http://localhost
   ports:
     vars:
-      ports_enabled:
-        type: bool
-        description: Expose HTTP/HTTPS ports
-        default: true
       ports_http:
         type: int
         description: HTTP port
         default: 80
-      ports_https:
+      ports_ssh:
         type: int
-        description: HTTPS port
-        default: 443
+        description: SSH port
+        default: 2424
       ports_registry:
         type: int
-        description: Port for Container Registry
+        description: Container Registry port
         default: 5678
   traefik:
     vars: