Merge pull request geerlingguy#114 from upciti/container_registry

Add configuration options for gitlab container registry.
veselinovic · May 22, 2020 · 5d8b964 · 5d8b964
2 parents 5859d11 + dedfec4
commit 5d8b964
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -67,3 +67,9 @@ gitlab_email_enabled: "false"
 gitlab_email_from: "gitlab@example.com"
 gitlab_email_display_name: "Gitlab"
 gitlab_email_reply_to: "gitlab@example.com"
+
+# Registry configuration.
+gitlab_registry_enable: "false"
+gitlab_registry_external_url: "https://gitlab.example.com:4567"
+gitlab_registry_nginx_ssl_certificate: "/etc/gitlab/ssl/gitlab.crt"
+gitlab_registry_nginx_ssl_certificate_key: "/etc/gitlab/ssl/gitlab.key"
diff --git a/templates/gitlab.rb.j2 b/templates/gitlab.rb.j2
@@ -80,6 +80,12 @@ nginx['ssl_verify_client'] = "{{ gitlab_nginx_ssl_verify_client }}"
 nginx['ssl_client_certificate'] = "{{ gitlab_nginx_ssl_client_certificate }}"
 {% endif %}
 
+# GitLab registry.
+registry['enable'] = {{ gitlab_registry_enable }}
+registry_external_url "{{ gitlab_registry_external_url }}"
+registry_nginx['ssl_certificate'] = "{{ gitlab_registry_nginx_ssl_certificate }}"
+registry_nginx['ssl_certificate_key'] = "{{ gitlab_registry_nginx_ssl_certificate_key }}"
+
 {% if gitlab_extra_settings is defined %}
 # Extra configuration
 {% for extra in gitlab_extra_settings %}