Skip to content
Snippets Groups Projects
Commit cc6f2ca9 authored by Jens Sandmann's avatar Jens Sandmann
Browse files

gitlab: ensure restarts after config changes, ansible stuff

gitlab: register configchanges so they stop the container, not using handler
 as these would cause it to restart twice on changes to the docker-compose.yml
gitlab: removed the kas option as it stopped gitlab from starting, probably we
 used the config from master and not 13.4.4
ansible: make tasks more pretty
parent 0e6e10f1
No related branches found
No related tags found
No related merge requests found
......@@ -5,31 +5,37 @@
- { path: /srv/shared/noreply_email_pass, length: -1 }
- { path: /srv/ldap/secret/ldap_readonly_pass, length: -1 }
# Benötigte Verzeichnisstrukturen erstellen
- name: create folder struct for gitlab 1
file: path=/srv/gitlab/ state=directory
- name: create folder struct for gitlab 2
file: path=/srv/gitlab/conf/ state=directory
# Benötigte Verzeichnisstrukturen erstellen
- name: create folder structur for gitlab
file:
path: "{{ item }}"
state: directory
owner: root
group: root
with_items:
- "/srv/gitlab/"
- "/srv/gitlab/conf/"
- "/srv/gitlab/data/"
- "/srv/gitlab/log"
- name: create folder struct for gitlab 3
file: path=/srv/gitlab/data/ state=directory
# Konfigurationsdateien erstellen
- name: create folder struct for gitlab 4
file: path=/srv/gitlab/log/ state=directory
- name: Konfig-Datei Gitlab
template:
src: "{{ item }}"
dest: "/srv/gitlab/{{ item }}"
with_items:
- "conf/gitlab.rb"
- "docker-compose.yml"
register: configs
# Konfigurationsdateien erstellen
- name: Konfig-Datei Gitlab
template:
src: "gitlab.rb"
dest: "/srv/gitlab/conf/gitlab.rb"
- name: Konfig-Datei Gitlab
template:
src: "docker-compose.yml"
dest: "/srv/gitlab/docker-compose.yml"
- name: stop gitlab docker
docker_compose:
project_src: /srv/gitlab/
state: absent
when: configs.changed
- name: start gitlab docker
docker_compose:
......
......@@ -1627,7 +1627,6 @@ nginx['proxy_set_headers'] = {
##! Enable GitLab KAS
# gitlab_kas['enable'] = true
gitlab_kas['enable'] = false
##! Agent configuration for GitLab KAS
# gitlab_kas['agent_configuration_poll_period'] = 20
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment