commit message from python script

This commit is contained in:
2023-11-29 11:25:44 +01:00
parent 5ae277dd3f
commit 6389205bed
3 changed files with 20 additions and 8 deletions

View File

@@ -1,7 +1,8 @@
gitlab_folder: ".gitlab2"
gitlab_dir: gitlab_dir:
- "/home/{{ansible_user}}/.gitlab2" - "/home/{{ansible_user}}/{{gitlab_folder}}"
- "/home/{{ansible_user}}/.gitlab2/config" - "/home/{{ansible_user}}/{{gitlab_folder}}/config"
- "/home/{{ansible_user}}/.gitlab2/log" - "/home/{{ansible_user}}/{{gitlab_folder}}/log"
- "/home/{{ansible_user}}/.gitlab2/data" - "/home/{{ansible_user}}/{{gitlab_folder}}/data"
- "/home/{{ansible_user}}/.gitlab2/config/ssl" - "/home/{{ansible_user}}/{{gitlab_folder}}/config/ssl"

View File

@@ -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 - name: Template Docker compose
template: template:
src: docker-compose.yml.j2 src: docker-compose.yml.j2
@@ -36,4 +44,4 @@
# docker_compose: # docker_compose:
# project_src: "{{jenkins_dir[0]}}" # project_src: "{{jenkins_dir[0]}}"
# files: # files:
# - docker-compose.yml # - docker-compose.yml

View File

@@ -8,13 +8,16 @@ services:
environment: environment:
GITLAB_OMNIBUS_CONFIG: | GITLAB_OMNIBUS_CONFIG: |
gitlab_rails['time_zone'] = 'Europe/Berlin' gitlab_rails['time_zone'] = 'Europe/Berlin'
external_url 'https://{{ansible_host}}' external_url 'https://{{gitlab_hostname}}'
gitlab_rails['gitlab_shell_ssh_port'] = {{ssh_port}} gitlab_rails['gitlab_shell_ssh_port'] = {{ssh_port}}
nginx['listen_port'] = 443 nginx['listen_port'] = 443
nginx['redirect_http_to_https'] = true nginx['redirect_http_to_https'] = true
nginx['ssl_certificate'] = "/etc/gitlab/ssl/gitlab.cer" nginx['ssl_certificate'] = "/etc/gitlab/ssl/gitlab.cer"
nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/gitlab.key" nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/gitlab.key"
nginx['ssl_protocols'] = "TLSv1.1 TLSv1.2" 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: ports:
- '{{http_ssl}}:443' - '{{http_ssl}}:443'
- '{{ssh_port}}:22' - '{{ssh_port}}:22'
@@ -22,4 +25,4 @@ services:
- '{{gitlab_dir[1]}}:/etc/gitlab' - '{{gitlab_dir[1]}}:/etc/gitlab'
- '{{gitlab_dir[2]}}:/var/log/gitlab' - '{{gitlab_dir[2]}}:/var/log/gitlab'
- '{{gitlab_dir[3]}}:/var/opt/gitlab' - '{{gitlab_dir[3]}}:/var/opt/gitlab'
shm_size: '{{shm_size}}' shm_size: '{{shm_size}}'