Update 2 files

- /group_vars/all.yml
- /roles/gitlab/tasks/main.yml

group_vars/all.yml

@@ -258,7 +258,7 @@ minecraft_online_mode: "true"
 minecraft_mods:
   - "https://mediafilez.forgecdn.net/files/7178/775/create-1.21.1-6.0.8.jar"
 
-# ------------ manage (192.168.1.228) ------------
+# ------------ manage (192.168.1.208) ------------
 meshcentral_base_dir: "/opt/meshcentral"
 meshcentral_data_dir: "/mnt/mesh/meshcentral-data"
 meshcentral_files_dir: "/mnt/mesh/meshcentral-files"
@@ -278,7 +278,7 @@ grafana_admin_user: admin
 grafana_admin_password: 13qeadZC
 grafana_root_url: https://mon.zailon.ru
 
-# ------------ Loki------------
+# Loki
 loki_base_dir: "/mnt/loki"
 loki_config_dir: "{{ loki_base_dir }}/config"
 loki_data_dir: "{{ loki_base_dir }}/data"
@@ -287,6 +287,19 @@ loki_server_port: "{{ monitoring_ports.loki }}"  # 3100
 loki_version: "2.9.2"
 loki_retention_days: 30
 
-# ------------ Promtail ------------
+# Promtail 
 promtail_config_dir: "/etc/promtail"
-promtail_data_dir: "/var/lib/promtail"
+promtail_data_dir: "/var/lib/promtail"
+
+# ------------ GitLab (192.168.1.209) ------------
+gitlab_base_dir: "/mnt/git"
+gitlab_config_dir: "{{ gitlab_base_dir }}/config"
+gitlab_logs_dir: "{{ gitlab_base_dir }}/logs"
+gitlab_data_dir: "{{ gitlab_base_dir }}/data"
+gitlab_backup_dir: "{{ gitlab_base_dir }}/backup"
+gitlab_http_port: "45130"
+gitlab_ssh_port: "2222"
+gitlab_version: "17.5.5-ce.0"
+gitlab_hostname: "git.zailon.ru"
+gitlab_external_url: "http://git.zailon.ru"
+gitlab_root_password: "ChangeMe123!"

roles/gitlab/tasks/main.yml

@@ -18,13 +18,26 @@
     dest: "{{ gitlab_base_dir }}/docker-compose.yml"
     mode: '0644'
 
-- name: Start GitLab container
+- name: Check if GitLab container is running
-  community.docker.docker_compose:
+  shell: docker ps --filter "name=gitlab" --format "{{ '{{.Names}}' }}"
-    project_src: "{{ gitlab_base_dir }}"
+  register: gitlab_container_check
-    build: no
+  changed_when: false
-    state: present
 
-- name: Wait for GitLab to be ready (first boot can take 5-10 minutes)
+- name: Start GitLab container with Docker Compose
+  command: 
+    cmd: docker compose up -d
+    chdir: "{{ gitlab_base_dir }}"
+  when: "'gitlab' not in gitlab_container_check.stdout"
+
+- name: Restart GitLab if configuration changed
+  command: 
+    cmd: docker compose up -d --force-recreate
+    chdir: "{{ gitlab_base_dir }}"
+  when: 
+    - "'gitlab' in gitlab_container_check.stdout"
+    - gitlab_container_check is changed
+
+- name: Wait for GitLab to be ready
   wait_for:
     host: "{{ ansible_host }}"
     port: "{{ gitlab_http_port }}"