Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/ansible-warpzone

# Conflicts:
#	warpsrvint/docker_grafana/tasks/main.yml
#	warpsrvint/docker_influx/tasks/main.yml
#	warpsrvint/docker_kapacitor/tasks/main.yaml
#	warpsrvint/docker_l4z0r/tasks/main.yml
#	warpsrvint/docker_librenms/tasks/main.yml
#	warpsrvint/docker_matestatdb/tasks/main.yml
#	webserver/docker_alerta/tasks/main.yml
#	webserver/docker_hackmd/tasks/main.yml
#	webserver/docker_keycloak/tasks/main.yml

warpsrvint/docker_grafana/tasks/main.yml

@@ -6,7 +6,7 @@
     - { path: /srv/grafana/grafana_admin_pass, length: 12 }
 
 - name: create folder struct for grafana
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
   with_items:
@@ -16,7 +16,7 @@
 
 - name: create config files
   template: src={{ item }} dest=/srv/grafana/config/{{ item }}
-  with_items: 
+  with_items:
     - grafana.ini
     - ldap.toml
   register: config
@@ -36,4 +36,3 @@
   docker_service:
     project_src: /srv/grafana/
     state: present
-

warpsrvint/docker_influx/tasks/main.yml

@@ -3,10 +3,10 @@
 - include_tasks: ../functions/get_secret.yml
   with_items:
    - { path: /srv/influx/influx_admin_pw,  length: 24 }
- 
+
 
 - name: create folder struct for influx
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
   with_items:

warpsrvint/docker_kapacitor/tasks/main.yaml

@@ -5,7 +5,7 @@
    - { path: /srv/kapacitor/alerta_token,  length: -1 }
 
 - name: create folder struct for kapacitor
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
   with_items:
@@ -49,7 +49,7 @@
     - task_mem_used.tick
     - task_notraffic_globe.tick
     - task_notraffic_telekom.tick
-  notify: restart kapacitor docker 
+  notify: restart kapacitor docker
 
 
 - name: start kapacitor docker

warpsrvint/docker_l4z0r/tasks/main.yml

 ---
 
-# Create folders 
-- name: create folder struct for l4z0r 
-  file: 
-    path: "{{ item }}" 
+# Create folders
+- name: create folder struct for l4z0r
+  file:
+    path: "{{ item }}"
     state: "directory"
   with_items:
     - "/srv/l4z0r"
@@ -15,15 +15,14 @@
     - { path: /srv/l4z0r/mysql_root_pw, length: 24 }
     - { path: /srv/l4z0r/mysql_user_pw, length: 12 }
 
-# Create docker-compose.yml 
+# Create docker-compose.yml
 - name: Konfig-Datei erstellen
-  template: 
-    src: "docker-compose.yml" 
+  template:
+    src: "docker-compose.yml"
     dest: "/srv/l4z0r/docker-compose.yml"
 
-# Start containers        
+# Start containers
 - name: start l4z0r docker
   docker_service:
     project_src: /srv/l4z0r/
     state: present
-

warpsrvint/docker_librenms/tasks/main.yml

@@ -7,7 +7,7 @@
     - { path: /srv/librenms/mysql_user_pw, length: 12 }
 
 - name: create folder struct for librenms
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
     owner: www-data

warpsrvint/docker_matestatdb/tasks/main.yml

@@ -5,12 +5,12 @@
     - { path: /srv/matestatdb/postgres_admin_pw, length: 24 }
 
 - name: create folder struct for matestatdb
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
   with_items:
     - "/srv/matestatdb/"
-    - "/srv/matestatdb/data/"   
+    - "/srv/matestatdb/data/"
 
 - name: Docker Compose Konfig-Datei erstellen
   template:

webserver/docker_alerta/tasks/main.yml

@@ -7,10 +7,10 @@
    - { path: /srv/alerta/alerta_token,  length: -1 }
    - { path: /srv/alerta/telegram_token,  length: -1 }
    - { path: /srv/alerta/telegram_chatid,  length: -1 }
- 
+
 
 - name: create folder struct for alerta
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
   with_items:

webserver/docker_gitlab/templates/docker-compose.yml

@@ -5,7 +5,7 @@ services:
 
   app:
 
-    image: gitlab/gitlab-ce:11.0.3-ce.0
+    image: gitlab/gitlab-ce:11.1.2-ce.0
     restart: always
     ports:
       - 0.0.0.0:444:22

webserver/docker_hackmd/tasks/main.yml

@@ -6,10 +6,10 @@
    - { path: /srv/hackmd/mysql_user_pass,  length: 12 }
    - { path: /srv/hackmd/hackmd_session_secret,  length: 32 }
    - { path: /srv/ldap/secret/ldap_readonly_pass,  length: -1 }
- 
+
 
 - name: create folder struct for hackmd
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
   with_items:

webserver/docker_keycloak/tasks/main.yml

@@ -4,10 +4,10 @@
   with_items:
    - { path: /srv/keycloak/keycloak_admin_pass,  length: 24 }
    - { path: /srv/keycloak/postgres_user_pass,  length: 12 }
- 
+
 
 - name: create folder struct for keycloak
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
   with_items: