ghp/ansible
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add short names

Browse Source 
add publish conditions for services

use official gitea helm chart
This commit is contained in:
ace
2021-01-25 21:04:57 +03:00
parent f1694a4e81
commit 82c5f35eda
26 changed files with 182 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
roles/postfix/defaults/main.yaml
View File

@ -1,3 +1,4 @@
postfix_short_name: "postfix"
postfix_default_values:
replicaCount: 1
persistence:
@ -6,7 +7,7 @@ postfix_default_values:
tls:
enabled: true
existingSecret: mail.{{ domain }}-secret
existingSecret: {{ mail_short_name | default('mail') }}.{{ domain }}-secret
postfix:
image:
@ -29,7 +30,7 @@ postfix_default_values:
mail_owner = postfix
# Postfix full server name for mail send/recieve
myhostname = mail.{{ domain }}
myhostname = {{ mail_short_name | default('mail') }}.{{ domain }}
# Set domain name
mydomain = {{ domain }}
@ -58,7 +59,7 @@ postfix_default_values:
# Dovecot socket for mail delivery
#virtual_transport = lmtp:unix:private/dovecot-lmtp
virtual_transport = lmtp:inet:dovecot.{{ namespace }}.svc.cluster.local:24
virtual_transport = lmtp:inet:{{ dovecot_short_name | default('dovecot') }}.{{ namespace }}.svc.cluster.local:24
# Certs and TLS options
smtpd_tls_cert_file = /tls/tls.crt
@ -89,12 +90,12 @@ postfix_default_values:
smtpd_sasl_security_options = noanonymous
broken_sasl_auth_clients = yes
smtpd_sasl_type = dovecot
smtpd_sasl_path = inet:dovecot.{{ namespace }}.svc.cluster.local:12345
smtpd_sasl_path = inet:{{ dovecot_short_name | default('dovecot') }}.{{ namespace }}.svc.cluster.local:12345
smtpd_sasl_local_domain = $myorigin
milter_protocol = 6
milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen}
smtpd_milters = inet:rspamd.{{ namespace }}.svc.cluster.local:11332
smtpd_milters = inet:{{ rspamd_short_name | default('rspamd') }}.{{ namespace }}.svc.cluster.local:11332
non_smtpd_milters = $smtpd_milters
milter_default_action = accept
@ -197,7 +198,7 @@ postfix_default_values:
-o smtpd_recipient_restrictions=permit_mynetworks,permit_sasl_authenticated,reject
-o milter_macro_daemon_name=ORIGINATING
-o smtpd_sasl_type=dovecot
-o smtpd_sasl_path=inet:dovecot.{{ namespace }}.svc.cluster.local:12345
-o smtpd_sasl_path=inet:{{ dovecot_short_name | default('dovecot') }}.{{ namespace }}.svc.cluster.local:12345
-o smtpd_upstream_proxy_protocol=haproxy
10465 inet n - n - - smtpd
-o syslog_name=postfix/10465
@ -206,7 +207,7 @@ postfix_default_values:
-o smtpd_recipient_restrictions=permit_mynetworks,permit_sasl_authenticated,reject
-o milter_macro_daemon_name=ORIGINATING
-o smtpd_sasl_type=dovecot
-o smtpd_sasl_path=inet:dovecot.{{ namespace }}.svc.cluster.local:12345
-o smtpd_sasl_path=inet:{{ dovecot_short_name | default('dovecot') }}.{{ namespace }}.svc.cluster.local:12345
-o smtpd_upstream_proxy_protocol=haproxy
#
# ====================================================================
@ -281,7 +282,7 @@ postfix_default_values:
ldap-local-recipients: |
debuglevel = 0
version = 3
server_host = ldaps://openldap.{{ domain }}
server_host = ldaps://{{ openldap_short_name | default('openldap') }}.{{ domain }}
server_port = 636
bind_dn = uid=ldapbind,ou=services,{{ openldap_domain }}
bind_pw = {{ ldapbind_pass | default(ldapbind_password) }}