Merge branch 'master' of gitlab.com:rusty-bever/deployment

ansible/group_vars/all.yml

@@ -10,9 +10,9 @@ ansible_become_pass: !vault |
           6432
 
 portainer:
-  version: 2.11.1
+  version: 2.13.1
   domain: dock.rustybever.be
 
 traefik:
-  version: 2.6.1
+  version: 2.7.2
   acme_email: roosensjef@gmail.com

stacks/gitea.yml

@@ -3,7 +3,7 @@ version: '3.4'
 services:
   app:
     # Latest contains a development version
-    image: 'gitea/gitea:1.16.8'
+    image: 'gitea/gitea:1.17.0'
     
     deploy:
       mode: 'replicated'
@@ -31,7 +31,7 @@ services:
       - '/etc/localtime:/etc/localtime:ro'
 
   db:
-    image: 'postgres:14.3-alpine'
+    image: 'postgres:14.4-alpine'
 
     deploy:
       mode: 'replicated'

stacks/matrix.yml

@@ -150,45 +150,45 @@ services:
       - 'irc:/data'
 
   # =====DISCORD BRIDGE=====
-  discord:
+  # discord:
-    image: 'dock.mau.dev/mautrix/discord:latest'
+  #   image: 'dock.mau.dev/mautrix/discord:latest'
 
-    deploy:
+  #   deploy:
-      mode: 'replicated'
+  #     mode: 'replicated'
-      replicas: 1
+  #     replicas: 1
-      placement:
+  #     placement:
-        constraints:
+  #       constraints:
-          - 'node.labels.class==matrix'
+  #         - 'node.labels.class==matrix'
 
-    networks:
+  #   networks:
-      - 'default'
+  #     - 'default'
-      - 'monitoring'
+  #     - 'monitoring'
-    volumes:
+  #   volumes:
-      - 'discord:/data'
+  #     - 'discord:/data'
   
-  discord-db:
+  # discord-db:
-    image: 'postgres:14.3-alpine'
+  #   image: 'postgres:14.3-alpine'
     
-    deploy:
+  #   deploy:
-      mode: 'replicated'
+  #     mode: 'replicated'
-      replicas: 1
+  #     replicas: 1
-      placement:
+  #     placement:
-        constraints:
+  #       constraints:
-          - 'node.labels.class==matrix'
+  #         - 'node.labels.class==matrix'
 
-    healthcheck:
+  #   healthcheck:
-      test: pg_isready -U matrix_discord
+  #     test: pg_isready -U matrix_discord
-      interval: 30s 
+  #     interval: 30s 
-      timeout: 5s
+  #     timeout: 5s
-      retries: 3
+  #     retries: 3
-      start_period: 15s
+  #     start_period: 15s
     
-    environment:
+  #   environment:
-      - 'POSTGRES_DB=matrix_discord'
+  #     - 'POSTGRES_DB=matrix_discord'
-      - 'POSTGRES_USER=matrix_discord'
+  #     - 'POSTGRES_USER=matrix_discord'
-      - 'POSTGRES_PASSWORD=matrix_discord'
+  #     - 'POSTGRES_PASSWORD=matrix_discord'
-    volumes:
+  #   volumes:
-      - 'discord-db:/var/lib/postgresql/data'
+  #     - 'discord-db:/var/lib/postgresql/data'
 
 configs:
   conduit_v7:
@@ -208,5 +208,5 @@ volumes:
   signald:
   signal-db:
   irc:
-  discord:
+  # discord:
-  discord-db:
+  # discord-db: