diff --git a/roles/gitlab/tasks/main.yml b/roles/gitlab/tasks/main.yml index 7f25f49..0b4aef6 100644 --- a/roles/gitlab/tasks/main.yml +++ b/roles/gitlab/tasks/main.yml @@ -43,7 +43,7 @@ port: "{{ gitlab_http_port }}" timeout: 600 state: started - delay: 30 + delay: 5 - name: Check GitLab status uri: diff --git a/roles/gitlab/templates/docker-compose.gitlab.yml.j2 b/roles/gitlab/templates/docker-compose.gitlab.yml.j2 index 8a17c11..91a322d 100644 --- a/roles/gitlab/templates/docker-compose.gitlab.yml.j2 +++ b/roles/gitlab/templates/docker-compose.gitlab.yml.j2 @@ -19,7 +19,12 @@ services: node_exporter['enable'] = false redis_exporter['enable'] = false postgres_exporter['enable'] = false - gitaly['prometheus_listen_addr'] = false + gitaly['configuration'] = { + prometheus: { + listen_addr: 'localhost:9236', + enabled: false + } + } ports: - "{{ gitlab_http_port }}:80" - "{{ gitlab_ssh_port }}:22" @@ -28,10 +33,4 @@ services: - '{{ gitlab_logs_dir }}:/var/log/gitlab' - '{{ gitlab_data_dir }}:/var/opt/gitlab' - '{{ gitlab_backup_dir }}:/var/opt/gitlab/backups' - shm_size: '256m' - networks: - - gitlab-network - -networks: - gitlab-network: - driver: bridge \ No newline at end of file + shm_size: '256m' \ No newline at end of file