From f063af2478986ecbfbec932d880d0d57b068af50 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sat, 29 May 2021 11:21:20 +0100
Subject: [PATCH] Reconfigure gitlab on machine start

---
 ansible/roles/gitlab/files/gitlab-override.conf |  3 +++
 ansible/roles/gitlab/tasks/main.yml             | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 ansible/roles/gitlab/files/gitlab-override.conf

diff --git a/ansible/roles/gitlab/files/gitlab-override.conf b/ansible/roles/gitlab/files/gitlab-override.conf
new file mode 100644
index 0000000..0c49dcf
--- /dev/null
+++ b/ansible/roles/gitlab/files/gitlab-override.conf
@@ -0,0 +1,3 @@
+# Reconfigure GitLab before start. Mostly to ensure log directories exist
+[Service]
+ExecStartPre=/usr/bin/gitlab-ctl reconfigure
diff --git a/ansible/roles/gitlab/tasks/main.yml b/ansible/roles/gitlab/tasks/main.yml
index d1cb727..dd96cb1 100644
--- a/ansible/roles/gitlab/tasks/main.yml
+++ b/ansible/roles/gitlab/tasks/main.yml
@@ -2,3 +2,19 @@
   import_role:
     name: geerlingguy.gitlab
   become: true
+
+- name: Create dir for service override
+  file:
+    path: /usr/lib/systemd/system/gitlab-runsvdir.service.d/
+    state: directory
+    mode: "0755"
+  become: true
+
+- name: Create override.conf
+  copy:
+    src: files/gitlab-override.conf
+    dest: /usr/lib/systemd/system/gitlab-runsvdir.service.d/gitlab-override.conf
+    owner: root
+    group: root
+    mode: "0644"
+  become: true