Update roles

roles/geerlingguy.gitlab/.gitignore

@@ -1,3 +1,5 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
+

roles/geerlingguy.gitlab/.travis.yml

@@ -1,32 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: gitlab
-  matrix:
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: debian9
-    - MOLECULE_DISTRO: centos7
-      MOLECULE_PLAYBOOK: playbook-version.yml
-    - MOLECULE_DISTRO: ubuntu1804
-      MOLECULE_PLAYBOOK: playbook-version.yml
-
-install:
-  # Install test dependencies.
-  - pip install molecule yamllint ansible-lint docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/

roles/geerlingguy.gitlab/.yamllint

@@ -1,6 +1,10 @@
 ---
 extends: default
+
 rules:
   line-length:
-    max: 140
+    max: 180
     level: warning
+
+ignore: |
+  .github/stale.yml

roles/geerlingguy.gitlab/README.md

@@ -1,6 +1,6 @@
 # Ansible Role: GitLab
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-gitlab.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-gitlab)
+[![CI](https://github.com/geerlingguy/ansible-role-gitlab/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-gitlab/actions?query=workflow%3ACI)
 
 Installs GitLab, a Ruby-based front-end to Git, on any RedHat/CentOS or Debian/Ubuntu linux system.
 
@@ -60,6 +60,17 @@ GitLab SSL configuration; tells GitLab to redirect normal http requests to https
 
 Whether to create a self-signed certificate for serving GitLab over a secure connection. Set `gitlab_self_signed_cert_subj` according to your locality and organization.
 
+### LetsEncrypt Configuration.
+
+    gitlab_letsencrypt_enable: "false"
+    gitlab_letsencrypt_contact_emails: ["gitlab@example.com"]
+    gitlab_letsencrypt_auto_renew_hour: 1
+    gitlab_letsencrypt_auto_renew_minute: 30
+    gitlab_letsencrypt_auto_renew_day_of_month: "*/7"
+    gitlab_letsencrypt_auto_renew: true
+
+GitLab LetsEncrypt configuration; tells GitLab whether to request and use a certificate from LetsEncrypt, if `gitlab_letsencrypt_enable` is set to `"true"`. Multiple contact emails can be configured under `gitlab_letsencrypt_contact_emails` as a list.
+
     # LDAP Configuration.
     gitlab_ldap_enabled: "false"
     gitlab_ldap_host: "example.com"

roles/geerlingguy.gitlab/defaults/main.yml

@@ -73,3 +73,11 @@ 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"
+
+# LetsEncrypt configuration.
+gitlab_letsencrypt_enable: "false"
+gitlab_letsencrypt_contact_emails: ["gitlab@example.com"]
+gitlab_letsencrypt_auto_renew_hour: 1
+gitlab_letsencrypt_auto_renew_minute: 30
+gitlab_letsencrypt_auto_renew_day_of_month: "*/7"
+gitlab_letsencrypt_auto_renew: true

roles/geerlingguy.gitlab/meta/.galaxy_install_info

@@ -1,2 +1,2 @@
-install_date: Wed Jun 24 18:44:32 2020
-version: 3.0.0
+install_date: Tue Apr 20 16:13:49 2021
+version: 3.1.0

roles/geerlingguy.gitlab/meta/main.yml

@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: gitlab
   author: geerlingguy
   description: GitLab Git web interface
   company: "Midwestern Mac, LLC"
@@ -10,8 +11,8 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 6
         - 7
+        - 8
     - name: Debian
       versions:
         - all

roles/geerlingguy.gitlab/molecule/default/molecule.yml

@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"

roles/geerlingguy.gitlab/molecule/default/playbook-version.yml

@@ -1,31 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: true
-
-  vars:
-    gitlab_restart_handler_failed_when: false
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=true cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-      changed_when: false
-
-    - name: Remove the .dockerenv file so GitLab Omnibus doesn't get confused.
-      file:
-        path: /.dockerenv
-        state: absent
-
-    - name: Set the test GitLab version number for Debian.
-      set_fact:
-        gitlab_version: '11.4.0-ce.0'
-      when: ansible_os_family == 'Debian'
-
-    - name: Set the test GitLab version number for RedHat.
-      set_fact:
-        gitlab_version: '11.4.0-ce.0.el7'
-      when: ansible_os_family == 'RedHat'
-
-  roles:
-    - role: geerlingguy.gitlab

roles/geerlingguy.gitlab/templates/gitlab.rb.j2

@@ -19,6 +19,15 @@ nginx['redirect_http_to_https'] = {{ gitlab_redirect_http_to_https }}
 nginx['ssl_certificate'] = "{{ gitlab_ssl_certificate }}"
 nginx['ssl_certificate_key'] = "{{ gitlab_ssl_certificate_key }}"
 
+letsencrypt['enable'] = "{{ gitlab_letsencrypt_enable }}"
+{% if gitlab_letsencrypt_enable %}
+letsencrypt['contact_emails'] = "{{ gitlab_letsencrypt_contact_emails | to_json }}"
+letsencrypt['auto_renew_hour'] = "{{ gitlab_letsencrypt_auto_renew_hour }}"
+letsencrypt['auto_renew_minute'] = "{{ gitlab_letsencrypt_auto_renew_minute }}"
+letsencrypt['auto_renew_day_of_month'] = "{{ gitlab_letsencrypt_auto_renew_day_of_month }}"
+letsencrypt['auto_renew'] = "{{ gitlab_letsencrypt_auto_renew }}"
+{% endif %}
+
 # The directory where Git repositories will be stored.
 git_data_dirs({"default" => {"path" => "{{ gitlab_git_data_dir }}"} })
 
@@ -82,7 +91,7 @@ nginx['ssl_client_certificate'] = "{{ gitlab_nginx_ssl_client_certificate }}"
 
 # GitLab registry.
 registry['enable'] = {{ gitlab_registry_enable }}
-{% if gitlab_registry_enable %}
+{% if gitlab_registry_enable == "true" %}
 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 }}"