From 6389205bed6128e43435ad71b6a4488e1b4c6910 Mon Sep 17 00:00:00 2001
From: jonnybravo <mr.blue82@gmail.com>
Date: Wed, 29 Nov 2023 11:25:44 +0100
Subject: [PATCH] commit message from python script

---
 gitlab/group_vars/all/main.yml                        | 11 ++++++-----
 gitlab/roles/docker_gitlab/tasks/main.yml             | 10 +++++++++-
 .../docker_gitlab/templates/docker-compose.yml.j2     |  7 +++++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/gitlab/group_vars/all/main.yml b/gitlab/group_vars/all/main.yml
index 168f54f..4f6093d 100755
--- a/gitlab/group_vars/all/main.yml
+++ b/gitlab/group_vars/all/main.yml
@@ -1,7 +1,8 @@
+gitlab_folder: ".gitlab2"
 gitlab_dir: 
-  - "/home/{{ansible_user}}/.gitlab2"
-  - "/home/{{ansible_user}}/.gitlab2/config"
-  - "/home/{{ansible_user}}/.gitlab2/log"
-  - "/home/{{ansible_user}}/.gitlab2/data"
-  - "/home/{{ansible_user}}/.gitlab2/config/ssl"
+  - "/home/{{ansible_user}}/{{gitlab_folder}}"
+  - "/home/{{ansible_user}}/{{gitlab_folder}}/config"
+  - "/home/{{ansible_user}}/{{gitlab_folder}}/log"
+  - "/home/{{ansible_user}}/{{gitlab_folder}}/data"
+  - "/home/{{ansible_user}}/{{gitlab_folder}}/config/ssl"
 
diff --git a/gitlab/roles/docker_gitlab/tasks/main.yml b/gitlab/roles/docker_gitlab/tasks/main.yml
index 6924886..9fde9c8 100755
--- a/gitlab/roles/docker_gitlab/tasks/main.yml
+++ b/gitlab/roles/docker_gitlab/tasks/main.yml
@@ -1,4 +1,12 @@
 ---
+- name: 
+  shell: "hostnamectl hostname"
+  register: var_gitlab_hostname
+
+- name: Set fact for gitlab_hostname
+  set_fact:
+    gitlab_hostname: "{{ var_gitlab_hostname.stdout }}"
+
 - name: Template Docker compose
   template:
     src: docker-compose.yml.j2
@@ -36,4 +44,4 @@
 #  docker_compose:
 #    project_src: "{{jenkins_dir[0]}}"
 #    files:
-#    - docker-compose.yml
\ No newline at end of file
+#    - docker-compose.yml
diff --git a/gitlab/roles/docker_gitlab/templates/docker-compose.yml.j2 b/gitlab/roles/docker_gitlab/templates/docker-compose.yml.j2
index 7377539..7cb709c 100755
--- a/gitlab/roles/docker_gitlab/templates/docker-compose.yml.j2
+++ b/gitlab/roles/docker_gitlab/templates/docker-compose.yml.j2
@@ -8,13 +8,16 @@ services:
     environment:
       GITLAB_OMNIBUS_CONFIG: |
         gitlab_rails['time_zone'] = 'Europe/Berlin'
-        external_url 'https://{{ansible_host}}'
+        external_url 'https://{{gitlab_hostname}}'
         gitlab_rails['gitlab_shell_ssh_port'] = {{ssh_port}}
         nginx['listen_port'] = 443
         nginx['redirect_http_to_https'] = true
         nginx['ssl_certificate'] = "/etc/gitlab/ssl/gitlab.cer"
         nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/gitlab.key"
         nginx['ssl_protocols'] = "TLSv1.1 TLSv1.2"
+        registry_external_url = 'https://registry.{{gitlab_hostname}}'
+        registry['registry_http_addr'] = "0.0.0.0:5000"
+        registry_nginx['enable'] = false
     ports:
       - '{{http_ssl}}:443'
       - '{{ssh_port}}:22'
@@ -22,4 +25,4 @@ services:
       - '{{gitlab_dir[1]}}:/etc/gitlab'
       - '{{gitlab_dir[2]}}:/var/log/gitlab'
       - '{{gitlab_dir[3]}}:/var/opt/gitlab'
-    shm_size: '{{shm_size}}'
\ No newline at end of file
+    shm_size: '{{shm_size}}'