From 1ebe393a04a71f1bed7660d242863a1cfb9b1dec Mon Sep 17 00:00:00 2001
From: Falk Rehse <falk.rehse@tu-dortmund.de>
Date: Sun, 16 Jun 2024 11:44:57 +0200
Subject: [PATCH] Add option to disable registry-metadata-database cleanup
---
defaults/main.yml | 1 +
meta/.galaxy_install_info | 2 ++
tasks/main.yml | 14 ++++++++++++++
3 files changed, 17 insertions(+)
create mode 100644 meta/.galaxy_install_info
diff --git a/defaults/main.yml b/defaults/main.yml
index 6cbf3b1..655109b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -11,6 +11,7 @@ gitlab_external_postgres_on_cluster: false
gitlab_use_borgbackup: false
gitlab_enable_plantuml: false
+gitlab_enable_offline_registry_cleanup: true # needs to be disabled if using registry-metadata-database
postgresql_apt_key_id: "ACCC4CF8"
postgresql_apt_key_url: "https://www.postgresql.org/media/keys/ACCC4CF8.asc"
diff --git a/meta/.galaxy_install_info b/meta/.galaxy_install_info
new file mode 100644
index 0000000..ac6e4a5
--- /dev/null
+++ b/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Thu 06 Jun 2024 10:53:43
+version: v2.5.0
diff --git a/tasks/main.yml b/tasks/main.yml
index 54d11f8..97bfbfc 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -11,6 +11,18 @@
postgres_on_cluster: "{{ gitlab_external_postgres_on_cluster }}"
when: gitlab_external_postgres
+- name: Create registry user and db on server
+ ansible.builtin.include_role:
+ name: postgresql_client
+ vars:
+ db_user:
+ name: "{{ gitlab_pgdb_registry_user }}"
+ password: "{{ gitlab_pgdb_registry_pass }}"
+ db_host: "{{ gitlab_pgdb_registry_host }}"
+ db_extensions: ["pg_trgm"]
+ postgres_on_cluster: "{{ gitlab_external_postgres_on_cluster }}"
+ when: gitlab_external_postgres
+
- name: Check if GitLab configuration file already exists
ansible.builtin.stat:
path: /etc/gitlab/gitlab.rb
@@ -156,6 +168,7 @@
dest: "/etc/systemd/system/"
mode: '0644'
with_fileglob: "gitlab_registry_cleanup.*"
+ when: gitlab_enable_offline_registry_cleanup
- name: Enable registry cleanup timer
ansible.builtin.systemd:
@@ -163,6 +176,7 @@
enabled: true
state: started
daemon-reload: true
+ when: gitlab_enable_offline_registry_cleanup
- name: Install PlantUML
ansible.builtin.import_tasks: plantuml.yml
--
GitLab