Skip to content
Snippets Groups Projects
Commit 31d43a1a authored by void's avatar void
Browse files

reconfigure e-mail sending from noreply-address

parent c06ac527
No related branches found
No related tags found
1 merge request!55Mailsetup Migration from mailcow to mailu
This commit is part of merge request !55. Comments created here will be created in the context of that merge request.
...@@ -63,7 +63,6 @@ administratorenteam: ...@@ -63,7 +63,6 @@ administratorenteam:
docker: docker:
# Interne Docker-Netzwerke # Interne Docker-Netzwerke
internal_networks: internal_networks:
- mail
- web - web
# Monitoring aktivieren # Monitoring aktivieren
......
...@@ -3,6 +3,7 @@ version: "3" ...@@ -3,6 +3,7 @@ version: "3"
services: services:
app: app:
# values set in configuration: noreply_email_user - noreply_email_pass - smtp_host - smtp_port
build: . build: .
image: "dokuwiki--{{ ansible_date_time.date }}--{{ ansible_date_time.hour }}-{{ ansible_date_time.minute }}-{{ ansible_date_time.second }}" image: "dokuwiki--{{ ansible_date_time.date }}--{{ ansible_date_time.hour }}-{{ ansible_date_time.minute }}-{{ ansible_date_time.second }}"
restart: always restart: always
...@@ -16,11 +17,8 @@ services: ...@@ -16,11 +17,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
...@@ -116,8 +116,8 @@ gitlab_rails['gitlab_email_enabled'] = true ...@@ -116,8 +116,8 @@ gitlab_rails['gitlab_email_enabled'] = true
# gitlab_rails['gitlab_email_smime_key_file'] = '/etc/gitlab/ssl/gitlab_smime.key' # gitlab_rails['gitlab_email_smime_key_file'] = '/etc/gitlab/ssl/gitlab_smime.key'
# gitlab_rails['gitlab_email_smime_cert_file'] = '/etc/gitlab/ssl/gitlab_smime.crt' # gitlab_rails['gitlab_email_smime_cert_file'] = '/etc/gitlab/ssl/gitlab_smime.crt'
# gitlab_rails['gitlab_email_smime_ca_certs_file'] = '/etc/gitlab/ssl/gitlab_smime_cas.crt' # gitlab_rails['gitlab_email_smime_ca_certs_file'] = '/etc/gitlab/ssl/gitlab_smime_cas.crt'
gitlab_rails['gitlab_email_from'] = '{{ noreply_email_user }}' gitlab_rails['gitlab_email_from'] = 'gitlab@{{ smtp_domain }}'
gitlab_rails['gitlab_email_display_name'] = 'Gitlab Warpzone' gitlab_rails['gitlab_email_display_name'] = 'Warpzone Gitlab'
gitlab_rails['gitlab_email_reply_to'] = '{{ noreply_email_user }}' gitlab_rails['gitlab_email_reply_to'] = '{{ noreply_email_user }}'
### GitLab user privileges ### GitLab user privileges
......
...@@ -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/keycloak/keycloak_admin_pass, length: 32 } - { path: /srv/keycloak/keycloak_admin_pass, length: 32 }
- { path: /srv/keycloak/postgres_user_pass, length: 24 } - { path: /srv/keycloak/postgres_user_pass, length: 24 }
......
...@@ -6,7 +6,7 @@ services: ...@@ -6,7 +6,7 @@ services:
app: app:
# values set in configuration: noreply_email_user - noreply_email_pass - smtp_host - smtp_port
image: jboss/keycloak:16.1.1 image: jboss/keycloak:16.1.1
restart: always restart: always
depends_on: depends_on:
...@@ -31,7 +31,6 @@ services: ...@@ -31,7 +31,6 @@ services:
- traefik.http.services.{{ servicename }}.loadbalancer.server.port=8080 - traefik.http.services.{{ servicename }}.loadbalancer.server.port=8080
networks: networks:
- default - default
- mail
- web - web
...@@ -64,7 +63,5 @@ services: ...@@ -64,7 +63,5 @@ services:
networks: networks:
mail:
external: true
web: web:
external: true external: true
...@@ -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
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