gitlab: Use explicit enabled flag for SAML & IMAP settings

BREAKING!

This patch consistently defines both variables and adds an explicit enabled flag to the structures.

roles/gitlab/defaults/main.yml

@@ -73,37 +73,44 @@ gitlab_csp:
   #script_src: "https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com"
 
 # SAML settings
-# gitlab_saml:
+gitlab_saml:
-#   label: "SAML"
+  enabled: false
-#   groups_attribute: "roles"
+  label: "SAML"
-#   external_groups: "{{ gitlab_domain }}:external"
+  groups_attribute: "roles"
-#   idp_cert_fingerprint: "<to be set>"
+  external_groups: "{{ gitlab_domain }}:external"
-#   idp_sso_target_url: "https://sso.example.com"
+  idp_cert_fingerprint: "<to be set>"
-#   idp_slo_target_url: "https://sso.example.com"
+  idp_sso_target_url: "https://sso.example.com"
-#   issuer: "{{ gitlab_domain }}"
+  idp_slo_target_url: "https://sso.example.com"
-#   certificate: "<cert without '----BEGIN CERTIFICATE----' (can be omited)>"
+  issuer: "{{ gitlab_domain }}"
-#   private_key: "<private key without '----BEGIN RSA PRIVATE KEY----' (can be omited)>"
+  certificate: "<cert without '----BEGIN CERTIFICATE----' (can be omited)>"
-#   attribute_statements:
+  private_key: "<private key without '----BEGIN RSA PRIVATE KEY----' (can be omited)>"
-#     first_name: "first_name"
+  attribute_statements:
-#     last_name: "last_name"
+    first_name: "first_name"
-#     name: "name"
+    last_name: "last_name"
-#     username: "username"
+    name: "name"
-#     email: "email"
+    username: "username"
-#   name_identifier_format: urn:oasis:names:tc:SAML:2.0:nameid-format:persistent
+    email: "email"
-#   autologin: false
+  name_identifier_format: urn:oasis:names:tc:SAML:2.0:nameid-format:persistent
+  autologin: false
 
 # IMAP settings (for email replies to comments etc.)
-# gitlab_imap:
+gitlab_imap:
-#   username: "{{ gitlab_smtp_user_name }}"
+  enabled: false
-#   password: "{{ gitlab_smtp_password }}"
+  username: "{{ gitlab_smtp_user_name }}"
-#   server_address: imap.example.com
+  password: "{{ gitlab_smtp_password }}"
-#   email_address: 'incoming+%{key}@gitlab.example.com'
+  server_address: imap.example.com
+  email_address: 'incoming+%{key}@gitlab.example.com'
 
 # Gitlab docker registry settings
 gitlab_registry:
   enabled: false
-  # external_port: 5050 # Defines the port that is appended to the registry domain used by gitlab.
+  # Defines the port that is appended to the registry domain used by gitlab.
-  # traefik_entrypoint: "websecure" # Defines the entrypoint that traefik should use for the registry. Can be useful to use another port while still using the certificate of the domain.
+  # This can be omitted, when no port is needed (eg. registry on its own domain)
+  external_port: 5050
+  # Defines the entrypoint that traefik should use for the registry.
+  # Can be useful to use another port while still using the certificate of the main domain.
+  # This can be omitted to use "websecure" by default
+  traefik_entrypoint: "websecure"
 
 # Gitlab telegraf configuration, allows to configure a monitoring setup for Gitlab
 gitlab_telegraf:

roles/gitlab/templates/docker-compose.yml

@@ -71,7 +71,7 @@ services:
         gitlab_rails['gravatar_plain_url'] = "http://{{ gitlab_libravatar_plain }}/avatar/%{hash}?s=%{size}&d=identicon"
         gitlab_rails['gravatar_ssl_url'] = "https://{{ gitlab_libravatar_ssl }}/avatar/%{hash}?s=%{size}&d=identicon"
 
-{% if gitlab_imap is defined %}
+{% if gitlab_imap.enabled %}
         gitlab_rails['incoming_email_enabled'] = true
 
         # The email address including the `%{key}` placeholder that will be replaced to reference the item being replied to.
@@ -120,7 +120,7 @@ services:
         registry_nginx['listen_https'] = false
 {% endif %}
 
-{% if gitlab_saml is defined %}
+{% if gitlab_saml.enabled %}
         # SAML settings
         gitlab_rails['omniauth_enabled'] = true
         gitlab_rails['omniauth_allow_single_sign_on'] = ['saml']