From 68c834a60af221f6d82f5be12108737480f40246 Mon Sep 17 00:00:00 2001
From: sonny <sonnyba871@gmail.com>
Date: Tue, 22 Oct 2024 10:07:52 +0200
Subject: [PATCH] Migration commit

---
 playbook.yml                | 53 ++++++++++++++++++++++++++++++++++++-
 tasks.yml                   | 39 ---------------------------
 templates/docker-compose.j2 |  3 ++-
 vars/main.yml               |  3 +--
 4 files changed, 55 insertions(+), 43 deletions(-)
 delete mode 100644 tasks.yml

diff --git a/playbook.yml b/playbook.yml
index 402bcec..12b3565 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -1,6 +1,57 @@
 - hosts: localhost
   tasks:
-    - import_tasks: 'tasks.yml'
+    - name: create gitlab home directory
+      file:
+        path: '{{ gitlab_home }}'
+        state: directory
+        mode: '0755'
+
+    - name: create gitlab app directory
+      become: true
+      file:
+        path: '{{ app_dir }}'
+        state: directory
+        mode: '0755'
+        owner: 'sonny'
+        group: 'sonny'
+
+    - name: copy docker-compose file
+      template:
+        src: 'templates/docker-compose.j2'
+        dest: '{{ app_dir }}/docker-compose.yml'
+        owner: 'sonny'
+        group: 'sonny'
+        mode: '0755'
+
+    - name: stop gitlab
+      command: docker compose --file docker-compose.yml down
+      args:
+        chdir: '{{ app_dir }}'
+      environment:
+        GITLAB_HOME: '{{ gitlab_home }}'
+
+    - name: pull gitlab {{ image_tag }}
+      command: docker compose --file docker-compose.yml pull
+      args:
+        chdir: '{{ app_dir }}'
+
+    - name: start gitlab
+      command: docker compose --file docker-compose.yml up --detach
+      args:
+        chdir: '{{ app_dir }}'
+      environment:
+        GITLAB_HOME: '{{ gitlab_home }}'
+
+    - name: reconfigure gitlab
+      command: >
+        docker compose
+          --file docker-compose.yml
+          exec --interactive --tty web gitlab-ctl reconfigure
+      args:
+        chdir: '{{ app_dir }}'
+      environment:
+        GITLAB_HOME: '{{ gitlab_home }}'
+
   vars_files:
     - 'vars/main.yml'
     - 'vars/email.yml'
diff --git a/tasks.yml b/tasks.yml
deleted file mode 100644
index 2dc1bc1..0000000
--- a/tasks.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-- name: create gitlab home directory
-  file:
-    path: '{{ gitlab_home }}'
-    state: directory
-    mode: '0755'
-
-- name: create gitlab app directory
-  become: true
-  file:
-    path: '{{ app_dir }}'
-    state: directory
-    mode: '0755'
-    owner: 'sonny'
-    group: 'sonny'
-
-- name: copy docker-compose file
-  become: true
-  template:
-    src: 'templates/docker-compose.j2'
-    dest: '{{ app_dir }}/docker-compose.yml'
-    owner: 'sonny'
-    group: 'sonny'
-    mode: '0755'
-
-- name: stop gitlab
-  docker_compose:
-    project_src: '{{ app_dir }}'
-    state: absent
-  environment:
-    GITLAB_HOME: '{{ gitlab_home }}'
-  when: manage_docker is true
-
-- name: start gitlab
-  docker_compose:
-    pull: true
-    project_src: '{{ app_dir }}'
-  environment:
-    GITLAB_HOME: '{{ gitlab_home }}'
-  when: manage_docker is true
diff --git a/templates/docker-compose.j2 b/templates/docker-compose.j2
index aafb86d..2ce1c01 100644
--- a/templates/docker-compose.j2
+++ b/templates/docker-compose.j2
@@ -1,4 +1,5 @@
-version: '3.6'
+# {{ ansible_managed }}
+
 services:
   web:
     image: 'gitlab/gitlab-ee:{{ image_tag }}'
diff --git a/vars/main.yml b/vars/main.yml
index ff6ef06..848063e 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,6 +1,5 @@
-hostname: 'git.fudiggity.nl'
+hostname: 'gitlab.fudiggity.nl'
 
-manage_docker: false
 image_tag: '17.2.1-ee.0'
 runner_image_tag: 'alpine3.19-v17.1.1'