From 5d62e46898bde39b2e18c253af996a693483289f Mon Sep 17 00:00:00 2001 From: Robin Opletal Date: Mon, 17 Oct 2022 15:48:35 +0200 Subject: [PATCH] feat(template): make gitlab pages configuration possible --- defaults/main.yml | 6 ++++++ templates/gitlab.rb.j2 | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 5f656f5d..156f2541 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -74,6 +74,12 @@ 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" +# Pages configuration. +gitlab_pages_enable: false +gitlab_pages_external_url: "https://pages.gitlab.example.com" +gitlab_pages_nginx_ssl_certificate: "/etc/gitlab/ssl/gitlab.crt" +gitlab_pages_nginx_ssl_certificate_key: "/etc/gitlab/ssl/gitlab.key" + # LetsEncrypt configuration. gitlab_letsencrypt_enable: false gitlab_letsencrypt_contact_emails: ["gitlab@example.com"] diff --git a/templates/gitlab.rb.j2 b/templates/gitlab.rb.j2 index 9a7c18a4..96f1420a 100644 --- a/templates/gitlab.rb.j2 +++ b/templates/gitlab.rb.j2 @@ -97,6 +97,14 @@ registry_nginx['ssl_certificate'] = "{{ gitlab_registry_nginx_ssl_certificate }} registry_nginx['ssl_certificate_key'] = "{{ gitlab_registry_nginx_ssl_certificate_key }}" {% endif %} +# GitLab pages. +gitlab_pages['enable'] = {{ gitlab_pages_enable | lower }} +{% if gitlab_pages_enable %} +pages_external_url "{{ gitlab_pages_external_url }}" +pages_nginx['ssl_certificate'] = "{{ gitlab_pages_nginx_ssl_certificate }}" +pages_nginx['ssl_certificate_key'] = "{{ gitlab_pages_nginx_ssl_certificate_key }}" +{% endif %} + {% if gitlab_extra_settings is defined %} # Extra configuration {% for extra in gitlab_extra_settings %}