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

webserver/docker_hackmd/tasks/main.yml

@@ -25,7 +25,7 @@
     - docker-compose.yml
     - mysql-utf8.cnf
 
-
+# TODO: [DEPRECATION WARNING]: The 'docker_service' module has been renamed to 'docker_compose'.. This feature will be removed in version 2.12. Deprecation warnings can be disabled by setting deprecation_warnings=False in ansible.cfg.
 - name: start hackmd docker
   docker_service:
     project_src: /srv/hackmd/

webserver/docker_hackmd/templates/docker-compose.yml

@@ -4,7 +4,7 @@ services:
 
   app:
 
-    image: hackmdio/hackmd:2.3.2
+    image: quay.io/hedgedoc/hedgedoc:1.7.2-debian
     restart: always
     depends_on:
       - db
@@ -30,8 +30,8 @@ services:
       - traefik.http.routers.{{ servicename }}.entrypoints=websecure
       - traefik.http.services.{{ servicename }}.loadbalancer.server.port=3000
     networks:
-      - default      
-      - web  
+      - default
+      - web
 
 
   db:
@@ -47,8 +47,8 @@ services:
       MYSQL_DATABASE: "hackmd"
       MYSQL_USER: "hackmd"
     networks:
-      - default      
+      - default
 
 networks:
   web:
-    external: true    
+    external: true

webserver/docker_mail/tasks/main.yaml

@@ -14,13 +14,9 @@
 
 - name: pakete installieren
   apt:
-    pkg: "{{ item }}"
+    pkg: ['git', 'logrotate', 'openssl']
     update_cache: no
     state: present
-  with_items:
-    - git
-    - logrotate
-    - openssl
 
 
 - name: "create folder struct for {{ servicename }}"
@@ -86,8 +82,8 @@
   git:
     repo: 'https://github.com/maxking/docker-mailman.git'
     dest: "{{ basedir }}/docker-mailman"
-    version: v0.3.10
-    # current version 2020-11-15
+    version: v0.3.11
+    # current version 2020-03-15
 
 
 - name: "create folder struct for {{ servicename }} 3"

webserver/docker_matrix/templates/docker-compose.yml

@@ -9,7 +9,7 @@ services:
   # psql -U synapse -d synapse < /var/lib/postgresql/data/dump.sql
 
   db:
-    
+
     image: postgres:13.2
     restart: always
     volumes:
@@ -20,11 +20,11 @@ services:
       POSTGRES_PASSWORD: "{{ postgres_user_pass }}"
       POSTGRES_INITDB_ARGS: --encoding=UTF-8 --lc-collate=C --lc-ctype=C
     networks:
-      - default      
+      - default
 
   synapse:
 
-    image: matrixdotorg/synapse:v1.26.0
+    image: matrixdotorg/synapse:v1.29.0
     restart: always
     cpu_count: "1"
     cpuset: "0"
@@ -49,9 +49,9 @@ services:
       - traefik.http.routers.matrix_federation.service=matrix_federation
       - traefik.http.services.matrix_federation.loadbalancer.server.port=8448
     networks:
-      - default      
-      - mail 
-      - web 
+      - default
+      - mail
+      - web
 
   ma1sd:
 
@@ -66,11 +66,11 @@ services:
       - traefik.http.routers.{{ servicename }}-ma1sd.entrypoints=websecure
       - traefik.http.services.{{ servicename }}-ma1sd.loadbalancer.server.port=8090
     networks:
-      - default      
-      - web  
+      - default
+      - web
 
 networks:
   mail:
-    external: true    
+    external: true
   web:
     external: true