Skip to content

Commit f23fd9e

Browse files
committed
Merge pull request 'Updated the docker image based on the new mailcow verison' (#1021) from upgraded-mailcow-latest into master
Reviewed-on: https://gitea.obmondo.com/EnableIT/LinuxAid/pulls/1021
2 parents 50fcf75 + 7574693 commit f23fd9e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

modules/enableit/profile/manifests/mail/mailcow.pp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@
117117
'MAILCOW_PASS_SCHEME' => 'BLF-CRYPT',
118118
'DBNAME' => 'mailcow',
119119
'DBUSER' => 'mailcow',
120-
'DBPASS' => $dbpass.node_encrypt::secret,
121-
'DBROOT' => $dbroot.node_encrypt::secret,
120+
'DBPASS' => $dbpass,
121+
'DBROOT' => $dbroot,
122122
'REDISPASS' => $redispass.node_encrypt::secret,
123123
'HTTP_BIND' => $http_bind,
124124
'HTTPS_BIND' => $http_bind,
@@ -155,7 +155,7 @@
155155
'SKIP_UNBOUND_HEALTHCHECK' => to_yn($skip_unbound_healthcheck),
156156
'EXPORTER_LISTEN_ADDRESS' => $exporter_listen_address,
157157
'MAILCOW_EXPORTER_HOST' => $domain,
158-
'MAILCOW_EXPORTER_API_KEY' => $exporter_api_key.node_encrypt::secret,
158+
'MAILCOW_EXPORTER_API_KEY' => $exporter_api_key,
159159
}),
160160
;
161161
# NOTE: These container tag are manually maintained to have a better control
@@ -169,7 +169,7 @@
169169
'mysql_image' => 'docker.io/mariadb:10.11',
170170
'redis_image' => 'docker.io/redis:7.4.2-alpine',
171171
'clamd_image' => 'ghcr.io/mailcow/clamd:1.70',
172-
'rspamd_image' => 'ghcr.io/mailcow/rspamd:2.1',
172+
'rspamd_image' => 'ghcr.io/mailcow/rspamd:2.2',
173173
'php_fpm_image' => 'ghcr.io/mailcow/phpfpm:1.93',
174174
'sogo_image' => 'ghcr.io/mailcow/sogo:1.133',
175175
'dovecot_image' => 'ghcr.io/mailcow/dovecot:2.33',
@@ -178,9 +178,9 @@
178178
'nginx_image' => 'ghcr.io/mailcow/nginx:1.03',
179179
'acme_image' => 'ghcr.io/mailcow/acme:1.92',
180180
'netfilter_image' => 'ghcr.io/mailcow/netfilter:1.61',
181-
'watchdog_image' => 'ghcr.io/mailcow/watchdog:2.07',
181+
'watchdog_image' => 'ghcr.io/mailcow/watchdog:2.08',
182182
'dockerapi_image' => 'ghcr.io/mailcow/dockerapi:2.11',
183-
'olefy_image' => 'ghcr.io/mailcow/olefy:1.14',
183+
'olefy_image' => 'ghcr.io/mailcow/olefy:1.15',
184184
'olefia_image' => 'docker.io/mcuadros/ofelia:latest',
185185
'ipv6nat_image' => 'docker.io/robbertkl/ipv6nat',
186186
'exporter_image' => $exporter_image,

0 commit comments

Comments
 (0)