Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • infrastruktur/ansible-warpzone
  • specki/ansible-warpzone
2 results
Show changes
yahoo.com polite:
hotmail.com polite:
outlook.com polite:
exchange.com polite:
microsoft.com polite:
1und1.de polite:
t-online.de polite:
web.de polite:
gmail.com polite:
...@@ -10,7 +10,7 @@ services: ...@@ -10,7 +10,7 @@ services:
db: db:
image: postgres:13.6 image: postgres:13.11
restart: always restart: always
volumes: volumes:
- /srv/matrix/db:/var/lib/postgresql/data - /srv/matrix/db:/var/lib/postgresql/data
...@@ -24,7 +24,7 @@ services: ...@@ -24,7 +24,7 @@ services:
synapse: synapse:
image: matrixdotorg/synapse:v1.78.0 image: matrixdotorg/synapse:v1.83.0
restart: always restart: always
cpu_count: "1" cpu_count: "1"
cpuset: "0" cpuset: "0"
...@@ -50,7 +50,6 @@ services: ...@@ -50,7 +50,6 @@ services:
- traefik.http.services.matrix_federation.loadbalancer.server.port=8448 - traefik.http.services.matrix_federation.loadbalancer.server.port=8448
networks: networks:
- default - default
- mail
- web - web
ma1sd: ma1sd:
...@@ -70,7 +69,5 @@ services: ...@@ -70,7 +69,5 @@ services:
- web - web
networks: networks:
mail:
external: true
web: web:
external: true external: true
...@@ -94,10 +94,12 @@ trusted_key_servers: ...@@ -94,10 +94,12 @@ trusted_key_servers:
- server_name: "matrix.org" - server_name: "matrix.org"
email: email:
smtp_host: postfix smtp_host: {{ smtp_host }}
smtp_port: 25 smtp_port: {{ smtp_port }}
smtp_user: "{{ noreply_email_user }}"
smtp_pass: "{{ noreply_email_pass }}"
require_transport_security: false require_transport_security: false
notif_from: "Your Friendly warpzone Matrix homeserver <{{ noreply_email_user }}>" notif_from: "Warpzone Matrix <matrix@{{ smtp_domain }}>"
enable_notifs: true enable_notifs: true
notif_for_new_users: False notif_for_new_users: False
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
- include_tasks: ../functions/get_secret.yml - include_tasks: ../functions/get_secret.yml
with_items: with_items:
- { path: /srv/shared/noreply_email_pass, length: -1 }
- { path: /srv/wordpress/mysql_root_pass, length: 24 } - { path: /srv/wordpress/mysql_root_pass, length: 24 }
- { path: /srv/wordpress/mysql_user_pass, length: 12 } - { path: /srv/wordpress/mysql_user_pass, length: 12 }
......
...@@ -18,7 +18,7 @@ services: ...@@ -18,7 +18,7 @@ services:
- default - default
app: app:
# values set in configuration: noreply_email_user - noreply_email_pass - smtp_host - smtp_port
build: . build: .
restart: always restart: always
volumes: volumes:
...@@ -35,11 +35,8 @@ services: ...@@ -35,11 +35,8 @@ services:
- traefik.http.services.{{ servicename }}.loadbalancer.server.port=80 - traefik.http.services.{{ servicename }}.loadbalancer.server.port=80
networks: networks:
- default - default
- mail
- web - web
networks: networks:
mail:
external: true
web: web:
external: true external: true