Skip to content
Snippets Groups Projects
Commit c1bf0f5a authored by Christian Elberfeld's avatar Christian Elberfeld
Browse files

Umstellung Mailserver, anpassung von Diensten

parent 074b77f3
No related branches found
No related tags found
No related merge requests found
...@@ -39,11 +39,11 @@ LDAP_GROUP_IS_STAFF = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms ...@@ -39,11 +39,11 @@ LDAP_GROUP_IS_STAFF = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
LDAP_GROUP_SUPERUSER = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms LDAP_GROUP_SUPERUSER = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
[email] [email]
SMTP_HOST = smtp.warpzone.ms SMTP_HOST = {{ smtp_host }}
SMTP_PORT = 25 SMTP_PORT = {{ smtp_port }}
SMTP_USERNAME = noreply@warpzone.ms SMTP_USERNAME = {{ noreply_email_user }}
SMTP_PASSWORD = {{ noreply_email_pass }} SMTP_PASSWORD = {{ noreply_email_pass }}
SMTP_EMAIL_FROM = infra@warpzone.ms SMTP_EMAIL_FROM = {{ noreply_email_user }}
SMTP_USE_TLS = True SMTP_USE_TLS = True
SUBJECT_PREFIX = '[TEST] ' SUBJECT_PREFIX = '[TEST] '
......
...@@ -20,8 +20,9 @@ ldap_readonly_bind_dn: cn=readonly,dc=warpzone,dc=ms ...@@ -20,8 +20,9 @@ ldap_readonly_bind_dn: cn=readonly,dc=warpzone,dc=ms
# SMTP Settings # SMTP Settings
smtp_host: smtp.warpzone.ms smtp_domain: warpzone.ms
smtp_port: 25 smtp_host: mailserver.warpzone.ms
smtp_port: 587
noreply_email_user: noreply@warpzone.ms noreply_email_user: noreply@warpzone.ms
...@@ -29,7 +30,7 @@ noreply_email_user: noreply@warpzone.ms ...@@ -29,7 +30,7 @@ noreply_email_user: noreply@warpzone.ms
mail_domains: mail_domains:
warpzonems: warpzonems:
maildomain: warpzone.ms maildomain: warpzone.ms
mxserver: mail.warpzone.ms mxserver: mailserver.warpzone.ms
mxhostname: webserver mxhostname: webserver
......
...@@ -19,7 +19,7 @@ ldap_admin_bind_dn: cn=admin,dc=warpzone-test,dc=ms ...@@ -19,7 +19,7 @@ ldap_admin_bind_dn: cn=admin,dc=warpzone-test,dc=ms
ldap_readonly_bind_dn: cn=readonly,dc=warpzone-test,dc=ms ldap_readonly_bind_dn: cn=readonly,dc=warpzone-test,dc=ms
# SMTP Settings # SMTP Settings
smtp_host: smtp.warpzone.ms smtp_host: mailserver.warpzone.ms
smtp_port: 25 smtp_port: 587
noreply_email_user: test-noreply-test@warpzone.ms noreply_email_user: test-noreply-test@warpzone.ms
global: global:
# The smarthost and SMTP sender used for mail notifications. # The smarthost and SMTP sender used for mail notifications.
smtp_smarthost: 'mail.warpzone.ms:25' smtp_smarthost: '{{ smtp_host }}:{{ smtp_port }}'
smtp_from: 'alert@warpzone.ms' smtp_from: '{{ noreply_email_user }}'
# smtp_auth_username: 'alertmanager' # smtp_auth_username: 'alertmanager'
# smtp_auth_password: 'password' # smtp_auth_password: 'password'
......
...@@ -39,11 +39,11 @@ LDAP_GROUP_IS_STAFF = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms ...@@ -39,11 +39,11 @@ LDAP_GROUP_IS_STAFF = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
LDAP_GROUP_SUPERUSER = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms LDAP_GROUP_SUPERUSER = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
[email] [email]
SMTP_HOST = smtp.warpzone.ms SMTP_HOST = {{ smtp_host }}
SMTP_PORT = 25 SMTP_PORT = {{ smtp_port }}
SMTP_USERNAME = noreply@warpzone.ms SMTP_USERNAME = {{ noreply_email_user }}
SMTP_PASSWORD = {{ noreply_email_pass }} SMTP_PASSWORD = {{ noreply_email_pass }}
SMTP_EMAIL_FROM = infra@warpzone.ms SMTP_EMAIL_FROM = {{ noreply_email_user }}
SMTP_USE_TLS = True SMTP_USE_TLS = True
SUBJECT_PREFIX = '' SUBJECT_PREFIX = ''
......
...@@ -89,11 +89,11 @@ gitlab_rails['time_zone'] = 'Europe/Berlin' ...@@ -89,11 +89,11 @@ gitlab_rails['time_zone'] = 'Europe/Berlin'
# gitlab_rails['smtp_enable_starttls_auto'] = true # gitlab_rails['smtp_enable_starttls_auto'] = true
# gitlab_rails['smtp_tls'] = false # gitlab_rails['smtp_tls'] = false
gitlab_rails['smtp_enable'] = true gitlab_rails['smtp_enable'] = true
gitlab_rails['smtp_address'] = "mail.warpzone.ms" gitlab_rails['smtp_address'] = "{{ smtp_host }}"
gitlab_rails['smtp_port'] = 25 gitlab_rails['smtp_port'] = {{ smtp_port }}
gitlab_rails['smtp_user_name'] = "noreply@warpzone.ms" gitlab_rails['smtp_user_name'] = "{{ noreply_email_user }}"
gitlab_rails['smtp_password'] = "{{ noreply_email_pass }}" gitlab_rails['smtp_password'] = "{{ noreply_email_pass }}"
gitlab_rails['smtp_domain'] = "warpzone.ms" gitlab_rails['smtp_domain'] = "{{ smtp_domain }}"
gitlab_rails['smtp_authentication'] = "plain" gitlab_rails['smtp_authentication'] = "plain"
gitlab_rails['smtp_enable_starttls_auto'] = true gitlab_rails['smtp_enable_starttls_auto'] = true
# gitlab_rails['smtp_tls'] = false # gitlab_rails['smtp_tls'] = false
...@@ -116,9 +116,9 @@ gitlab_rails['gitlab_email_enabled'] = true ...@@ -116,9 +116,9 @@ 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'] = 'gitlab@warpzone.ms' gitlab_rails['gitlab_email_from'] = '{{ noreply_email_user }}'
gitlab_rails['gitlab_email_display_name'] = 'Gitlab Warpzone' gitlab_rails['gitlab_email_display_name'] = 'Gitlab Warpzone'
gitlab_rails['gitlab_email_reply_to'] = 'noreply@warpzone.ms' gitlab_rails['gitlab_email_reply_to'] = '{{ noreply_email_user }}'
### GitLab user privileges ### GitLab user privileges
# gitlab_rails['gitlab_default_can_create_group'] = true # gitlab_rails['gitlab_default_can_create_group'] = true
......
...@@ -61,7 +61,7 @@ services: ...@@ -61,7 +61,7 @@ services:
- "{{ basedir }}/docker-mailman/nginx.conf:/etc/nginx/conf.d/default.conf:ro" - "{{ basedir }}/docker-mailman/nginx.conf:/etc/nginx/conf.d/default.conf:ro"
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.http.routers.{{ servicename }}-mailman.rule=Host(`listserver.warpzone.ms`) - traefik.http.routers.{{ servicename }}-mailman.rule=Host(`listserver.warpzone.ms`) || Host(`lists.warpzone.ms`)
- traefik.http.routers.{{ servicename }}-mailman.entrypoints=websecure - traefik.http.routers.{{ servicename }}-mailman.entrypoints=websecure
- traefik.http.services.{{ servicename }}-mailman.loadbalancer.server.port=80 - traefik.http.services.{{ servicename }}-mailman.loadbalancer.server.port=80
networks: networks:
......
...@@ -27,7 +27,7 @@ services: ...@@ -27,7 +27,7 @@ services:
nginx-mailcow: nginx-mailcow:
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.http.routers.{{ servicename }}-mailcow.rule=Host(`${MAILCOW_HOSTNAME}`) - traefik.http.routers.{{ servicename }}-mailcow.rule=Host(`${MAILCOW_HOSTNAME}`) || Host(`mail.warpzone.ms`)
- traefik.http.routers.{{ servicename }}-mailcow.entrypoints=websecure - traefik.http.routers.{{ servicename }}-mailcow.entrypoints=websecure
- traefik.http.services.{{ servicename }}-mailcow.loadbalancer.server.port=42012 - traefik.http.services.{{ servicename }}-mailcow.loadbalancer.server.port=42012
networks: networks:
......
...@@ -142,7 +142,7 @@ USE_WATCHDOG=y ...@@ -142,7 +142,7 @@ USE_WATCHDOG=y
# Multiple rcpts allowed, NO quotation marks, NO spaces # Multiple rcpts allowed, NO quotation marks, NO spaces
#WATCHDOG_NOTIFY_EMAIL=a@example.com,b@example.com,c@example.com #WATCHDOG_NOTIFY_EMAIL=a@example.com,b@example.com,c@example.com
#WATCHDOG_NOTIFY_EMAIL= WATCHDOG_NOTIFY_EMAIL=warpzone-server-issues@void.ms
# Notify about banned IP (includes whois lookup) # Notify about banned IP (includes whois lookup)
WATCHDOG_NOTIFY_BAN=n WATCHDOG_NOTIFY_BAN=n
......
...@@ -39,11 +39,11 @@ LDAP_GROUP_IS_STAFF = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms ...@@ -39,11 +39,11 @@ LDAP_GROUP_IS_STAFF = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
LDAP_GROUP_SUPERUSER = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms LDAP_GROUP_SUPERUSER = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
[email] [email]
SMTP_HOST = smtp.warpzone.ms SMTP_HOST = {{ smtp_host }}
SMTP_PORT = 25 SMTP_PORT = {{ smtp_port }}
SMTP_USERNAME = noreply@warpzone.ms SMTP_USERNAME = {{ noreply_email_user }}
SMTP_PASSWORD = {{ noreply_email_pass }} SMTP_PASSWORD = {{ noreply_email_pass }}
SMTP_EMAIL_FROM = infra@warpzone.ms SMTP_EMAIL_FROM = {{ noreply_email_user }}
SMTP_USE_TLS = True SMTP_USE_TLS = True
SUBJECT_PREFIX = '[TEST] ' SUBJECT_PREFIX = '[TEST] '
......
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