Skip to content

Commit 5c69c7b

Browse files
committed
Remove unneeded trailing spaces
1 parent 81ba21d commit 5c69c7b

File tree

1 file changed

+85
-85
lines changed

1 file changed

+85
-85
lines changed

charts/docker-mailserver/values.yaml

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ image:
99
# tag: "latest"
1010
pullPolicy: "IfNotPresent"
1111

12-
# Specify whether to create a serviceAccount for the pod. The name is generated from the
12+
# Specify whether to create a serviceAccount for the pod. The name is generated from the
1313
# dockermailserver.serviceAccountName template
1414
serviceAccount:
1515
create: true
@@ -29,13 +29,13 @@ deployment:
2929
affinity: {}
3030

3131
## Optionally add additional annotations to the deployment
32-
annotations: {}
32+
annotations: {}
3333

3434
## Optionally add additional labels to the deployment
35-
labels: {}
35+
labels: {}
3636

3737
## Optionally specify a runtimeClassName for the deployment
38-
runtimeClassName:
38+
runtimeClassName:
3939

4040
## Optionally specify a priorityClassName for the deployment
4141
priorityClassName:
@@ -44,9 +44,9 @@ deployment:
4444
nodeSelector: {}
4545

4646
## Update strategy - only really applicable for deployments with RWO PVs attached
47-
## If replicas = 1, an update can get "stuck", as the previous pod remains attached to the
48-
## PV, and the "incoming" pod can never start. Setting the strategy to "Recreate" (our default) will
49-
## terminate the single previous pod, so that the new, incoming pod can attach to the PV
47+
## If replicas = 1, an update can get "stuck", as the previous pod remains attached to the
48+
## PV, and the "incoming" pod can never start. Setting the strategy to "Recreate" (our default) will
49+
## terminate the single previous pod, so that the new, incoming pod can attach to the PV
5050
strategy:
5151
# rollingUpdate:
5252
# maxSurge: 1
@@ -68,21 +68,21 @@ deployment:
6868
LOG_LEVEL: info
6969
SUPERVISOR_LOGLEVEL:
7070
DMS_VMAIL_UID:
71-
DMS_VMAIL_GID:
72-
ACCOUNT_PROVISIONER:
73-
POSTMASTER_ADDRESS:
71+
DMS_VMAIL_GID:
72+
ACCOUNT_PROVISIONER:
73+
POSTMASTER_ADDRESS:
7474
ENABLE_UPDATE_CHECK: 1
7575
UPDATE_CHECK_INTERVAL: 1d
7676
PERMIT_DOCKER: none
77-
TZ:
78-
NETWORK_INTERFACE:
79-
TLS_LEVEL:
77+
TZ:
78+
NETWORK_INTERFACE:
79+
TLS_LEVEL:
8080
SPOOF_PROTECTION:
8181
ENABLE_SRS: 0
8282
ENABLE_OPENDKIM: 0
8383
ENABLE_OPENDMARC: 0
8484
ENABLE_POLICYD_SPF: 0
85-
ENABLE_POP3:
85+
ENABLE_POP3:
8686
ENABLE_IMAP: 1
8787
ENABLE_CLAMAV: 0
8888
ENABLE_RSPAMD: 1
@@ -98,29 +98,29 @@ deployment:
9898
ENABLE_DNSBL: 0
9999
ENABLE_FAIL2BAN: 0
100100
FAIL2BAN_BLOCKTYPE: drop
101-
ENABLE_MANAGESIEVE:
101+
ENABLE_MANAGESIEVE:
102102
POSTSCREEN_ACTION: enforce
103-
SMTP_ONLY:
103+
SMTP_ONLY:
104104
# These values are automatically set by the chart based on the certificate key
105105
# SSL_TYPE:
106-
# SSL_CERT_PATH:
107-
# SSL_KEY_PATH:
108-
SSL_ALT_CERT_PATH:
109-
SSL_ALT_KEY_PATH:
110-
VIRUSMAILS_DELETE_DELAY:
111-
POSTFIX_DAGENT:
112-
POSTFIX_MAILBOX_SIZE_LIMIT:
106+
# SSL_CERT_PATH:
107+
# SSL_KEY_PATH:
108+
SSL_ALT_CERT_PATH:
109+
SSL_ALT_KEY_PATH:
110+
VIRUSMAILS_DELETE_DELAY:
111+
POSTFIX_DAGENT:
112+
POSTFIX_MAILBOX_SIZE_LIMIT:
113113
ENABLE_QUOTAS: 1
114-
POSTFIX_MESSAGE_SIZE_LIMIT:
115-
CLAMAV_MESSAGE_SIZE_LIMIT:
116-
PFLOGSUMM_TRIGGER:
117-
PFLOGSUMM_RECIPIENT:
118-
PFLOGSUMM_SENDER:
119-
LOGWATCH_INTERVAL:
120-
LOGWATCH_RECIPIENT:
121-
LOGWATCH_SENDER:
122-
REPORT_RECIPIENT:
123-
REPORT_SENDER:
114+
POSTFIX_MESSAGE_SIZE_LIMIT:
115+
CLAMAV_MESSAGE_SIZE_LIMIT:
116+
PFLOGSUMM_TRIGGER:
117+
PFLOGSUMM_RECIPIENT:
118+
PFLOGSUMM_SENDER:
119+
LOGWATCH_INTERVAL:
120+
LOGWATCH_RECIPIENT:
121+
LOGWATCH_SENDER:
122+
REPORT_RECIPIENT:
123+
REPORT_SENDER:
124124
LOGROTATE_COUNT: 4
125125
LOGROTATE_INTERVAL: weekly
126126
POSTFIX_REJECT_UNKNOWN_CLIENT_HOSTNAME: 0
@@ -152,24 +152,24 @@ deployment:
152152
# -----------------------------------------------
153153
# --- LDAP Section ------------------------------
154154
# -----------------------------------------------
155-
LDAP_START_TLS:
156-
LDAP_SERVER_HOST:
157-
LDAP_SEARCH_BASE:
158-
LDAP_BIND_DN:
159-
LDAP_BIND_PW:
160-
LDAP_QUERY_FILTER_USER:
161-
LDAP_QUERY_FILTER_GROUP:
162-
LDAP_QUERY_FILTER_ALIAS:
163-
LDAP_QUERY_FILTER_DOMAIN:
155+
LDAP_START_TLS:
156+
LDAP_SERVER_HOST:
157+
LDAP_SEARCH_BASE:
158+
LDAP_BIND_DN:
159+
LDAP_BIND_PW:
160+
LDAP_QUERY_FILTER_USER:
161+
LDAP_QUERY_FILTER_GROUP:
162+
LDAP_QUERY_FILTER_ALIAS:
163+
LDAP_QUERY_FILTER_DOMAIN:
164164

165165
# -----------------------------------------------
166166
# --- Dovecot Section ---------------------------
167167
# -----------------------------------------------
168-
DOVECOT_TLS:
169-
DOVECOT_USER_FILTER:
170-
DOVECOT_PASS_FILTER:
168+
DOVECOT_TLS:
169+
DOVECOT_USER_FILTER:
170+
DOVECOT_PASS_FILTER:
171171
DOVECOT_MAILBOX_FORMAT: maildir
172-
DOVECOT_AUTH_BIND:
172+
DOVECOT_AUTH_BIND:
173173

174174
# -----------------------------------------------
175175
# --- Postgrey Section --------------------------
@@ -184,42 +184,42 @@ deployment:
184184
# --- SASL Section ------------------------------
185185
# -----------------------------------------------
186186
ENABLE_SASLAUTHD: 0
187-
SASLAUTHD_MECHANISMS:
188-
SASLAUTHD_MECH_OPTIONS:
189-
SASLAUTHD_LDAP_SERVER:
190-
SASLAUTHD_LDAP_BIND_DN:
191-
SASLAUTHD_LDAP_PASSWORD:
192-
SASLAUTHD_LDAP_SEARCH_BASE:
193-
SASLAUTHD_LDAP_FILTER:
194-
SASLAUTHD_LDAP_START_TLS:
195-
SASLAUTHD_LDAP_TLS_CHECK_PEER:
196-
SASLAUTHD_LDAP_TLS_CACERT_FILE:
197-
SASLAUTHD_LDAP_TLS_CACERT_DIR:
198-
SASLAUTHD_LDAP_PASSWORD_ATTR:
199-
SASLAUTHD_LDAP_AUTH_METHOD:
200-
SASLAUTHD_LDAP_MECH:
187+
SASLAUTHD_MECHANISMS:
188+
SASLAUTHD_MECH_OPTIONS:
189+
SASLAUTHD_LDAP_SERVER:
190+
SASLAUTHD_LDAP_BIND_DN:
191+
SASLAUTHD_LDAP_PASSWORD:
192+
SASLAUTHD_LDAP_SEARCH_BASE:
193+
SASLAUTHD_LDAP_FILTER:
194+
SASLAUTHD_LDAP_START_TLS:
195+
SASLAUTHD_LDAP_TLS_CHECK_PEER:
196+
SASLAUTHD_LDAP_TLS_CACERT_FILE:
197+
SASLAUTHD_LDAP_TLS_CACERT_DIR:
198+
SASLAUTHD_LDAP_PASSWORD_ATTR:
199+
SASLAUTHD_LDAP_AUTH_METHOD:
200+
SASLAUTHD_LDAP_MECH:
201201

202202
# -----------------------------------------------
203203
# --- SRS Section -------------------------------
204204
# -----------------------------------------------
205205
SRS_SENDER_CLASSES: envelope_sender
206-
SRS_EXCLUDE_DOMAINS:
207-
SRS_SECRET:
206+
SRS_EXCLUDE_DOMAINS:
207+
SRS_SECRET:
208208

209209
# -----------------------------------------------
210210
# --- Default Relay Host Section ----------------
211211
# -----------------------------------------------
212212

213-
DEFAULT_RELAY_HOST:
213+
DEFAULT_RELAY_HOST:
214214

215215
# -----------------------------------------------
216216
# --- Multi-Domain Relay Section ----------------
217217
# -----------------------------------------------
218218

219-
RELAY_HOST:
219+
RELAY_HOST:
220220
RELAY_PORT: 25
221-
RELAY_USER:
222-
RELAY_PASSWORD:
221+
RELAY_USER:
222+
RELAY_PASSWORD:
223223

224224
securityContext:
225225
runAsUser: 5000
@@ -258,7 +258,7 @@ deployment:
258258
## it may terminated.
259259
memory: "2048Mi"
260260
ephemeral-storage: "500Mi"
261-
261+
262262
## Optionally specify tolerations for the deployment
263263
tolerations: []
264264

@@ -372,26 +372,26 @@ persistence:
372372
mail-config:
373373
volumeName: mail-config
374374
mountPath: /tmp/docker-mailserver
375-
subPath:
375+
subPath:
376376

377377
# Stores emails
378378
mail-data:
379379
volumeName: mail-data
380380
mountPath: /var/mail
381-
subPath:
381+
subPath:
382382

383383
# Stores state for Postfix, Dovecot, Fail2Ban, Amavis, PostGrey, ClamAV, SpamAssassin, Rspamd & Redis
384384
# https://docker-mailserver.github.io/docker-mailserver/edge/faq/#what-about-the-docker-datadmsmail-state-directory
385385
mail-state:
386386
volumeName: mail-state
387387
mountPath: /var/mail-state
388-
subPath:
388+
subPath:
389389

390390
# Store mail logs
391391
mail-log:
392392
volumeName: mail-log
393393
mountPath: /var/log/mail
394-
subPath:
394+
subPath:
395395

396396
## Monitoring adds the prometheus.io annotations to pods and services, so that the Prometheus Kubernetes SD mechanism
397397
## as configured in the examples will automatically discover both the pods and the services to query.
@@ -408,7 +408,7 @@ monitoring:
408408
## monitoring should be configured to only scrape services that have a value of "true"
409409
scrape: "true"
410410
## monitoring should be configured to only probe services that have a value of "true"
411-
probe: "false"
411+
probe: "false"
412412
## Path on which metrics are exposed
413413
path: "/metrics"
414414
## Port on which HTTP server is served
@@ -418,7 +418,7 @@ monitoring:
418418
## monitoring should be configured to only scrape pods that have a value of `true`
419419
scrape: "true"
420420
## monitoring should be configured to only probe services that have a value of "true"
421-
probe: "false"
421+
probe: "false"
422422
## Path on which metrics are exposed
423423
path: "/metrics"
424424
## Port on which HTTP server is served
@@ -449,7 +449,7 @@ proxyProtocol:
449449
enabled: true
450450
# List of sources (in CIDR format, space-separated) to permit PROXY protocol from
451451
trustedNetworks: "10.0.0.0/8 192.168.0.0/16 172.16.0.0/16"
452-
452+
453453
# when metrics is enabled, we mount subpath log from pvc into /var/log/mail
454454
metrics:
455455
enabled: false
@@ -470,12 +470,12 @@ metrics:
470470
enabled: false
471471
scrapeInterval: 15s
472472
## Optionally add additional labels to the deployment
473-
labels: {}
473+
labels: {}
474474

475-
## ConfigMaps (and Secrets) are used to copy docker-mailserver configuration files
476-
## into running containers. This chart automatically sets up any config files that
477-
## are stored in its chart/config directory.
478-
##
475+
## ConfigMaps (and Secrets) are used to copy docker-mailserver configuration files
476+
## into running containers. This chart automatically sets up any config files that
477+
## are stored in its chart/config directory.
478+
##
479479
## However, Helm does not provide a way to save external files to a ConfigMap or Secret.
480480
## This is problem for docker-mailserver because you need to setup postfix accounts,
481481
## dovecot accounts, etc.
@@ -497,12 +497,12 @@ configMaps:
497497
inet_listener imap {
498498
port = 143
499499
}
500-
500+
501501
inet_listener imaps {
502502
port = 993
503503
ssl = yes
504504
}
505-
505+
506506
inet_listener imap_proxy {
507507
haproxy = yes
508508
port = 10143
@@ -514,15 +514,15 @@ configMaps:
514514
port = 10993
515515
ssl = yes
516516
}
517-
}
517+
}
518518
{{- end -}}
519519
520520
{{- if and (.Values.deployment.env.ENABLE_POP3) (not .Values.deployment.env.SMTP_ONLY) }}
521521
service pop3-login {
522522
inet_listener pop3 {
523523
port = 110
524524
}
525-
525+
526526
inet_listener pop3s {
527527
port = 995
528528
ssl = yes
@@ -538,7 +538,7 @@ configMaps:
538538
haproxy = yes
539539
port = 10995
540540
ssl = yes
541-
}
541+
}
542542
}
543543
{{- end -}}
544544
{{- end -}}
@@ -591,7 +591,7 @@ configMaps:
591591
-o smtpd_discard_ehlo_keywords=
592592
-o milter_macro_daemon_name=ORIGINATING
593593
-o cleanup_service_name=sender-cleanup
594-
-o smtpd_upstream_proxy_protocol=haproxy
594+
-o smtpd_upstream_proxy_protocol=haproxy
595595
596596
# Submissions with proxy
597597
10465 inet n - n - - smtpd

0 commit comments

Comments
 (0)