fix
This commit is contained in:
@@ -16,8 +16,8 @@ resource "authentik_application" "prj_app" {
|
||||
#protocol_provider = authentik_provider_oauth2.oauth2.id
|
||||
group = var.app_group
|
||||
backchannel_providers = [authentik_provider_scim.scim.id]
|
||||
meta_launch_url = format("https://%s.%s", var.sub-domain, var.domain_name)
|
||||
meta_icon = format("https://%s.%s/%s", var.sub-domain, var.domain_name, "favicon-32x32.png")
|
||||
meta_launch_url = format("https://%s.%s", var.sub_domain, var.domain_name)
|
||||
meta_icon = format("https://%s.%s/%s", var.sub_domain, var.domain_name, "favicon-32x32.png")
|
||||
}
|
||||
|
||||
resource "authentik_policy_expression" "policy" {
|
||||
|
||||
@@ -96,10 +96,10 @@ resource "kubernetes_config_map_v1" "haraka_config" {
|
||||
}
|
||||
data = yamldecode(<<-EOF
|
||||
me: |-
|
||||
${var.sub-domain}.${var.domain_name}
|
||||
${var.sub_domain}.${var.domain_name}
|
||||
host_list: |-
|
||||
# add hosts in here we want to accept mail for
|
||||
${var.sub-domain}.${var.domain_name}
|
||||
${var.sub_domain}.${var.domain_name}
|
||||
${var.domain_name}
|
||||
${join("\n ",var.additional-domains)}
|
||||
rspamd.ini: |-
|
||||
|
||||
@@ -43,7 +43,7 @@ options:
|
||||
examples:
|
||||
- letsencrypt-prod
|
||||
type: string
|
||||
sub-domain:
|
||||
sub_domain:
|
||||
default: mail
|
||||
examples:
|
||||
- mail
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
locals {
|
||||
dns_names = ["${var.sub-domain}.${var.domain_name}"]
|
||||
dns_names = ["${var.sub_domain}.${var.domain_name}"]
|
||||
cert-names = concat(local.dns_names, ["${var.domain_name}"])
|
||||
middlewares = ["${var.instance}-https"]
|
||||
service = {
|
||||
|
||||
@@ -154,15 +154,15 @@ resource "kubernetes_config_map_v1" "webmail_config" {
|
||||
[setup]
|
||||
# these values are shown in the configuration help page
|
||||
[setup.imap]
|
||||
hostname="${var.sub-domain}.${var.domain_name}"
|
||||
hostname="${var.sub_domain}.${var.domain_name}"
|
||||
secure=true
|
||||
port=143
|
||||
[setup.pop3]
|
||||
hostname="${var.sub-domain}.${var.domain_name}"
|
||||
hostname="${var.sub_domain}.${var.domain_name}"
|
||||
secure=true
|
||||
port=110
|
||||
[setup.smtp]
|
||||
hostname="${var.sub-domain}.${var.domain_name}"
|
||||
hostname="${var.sub_domain}.${var.domain_name}"
|
||||
secure=true
|
||||
port=25
|
||||
EOF
|
||||
|
||||
@@ -173,7 +173,7 @@ resource "kubernetes_config_map_v1" "wildduck_config" {
|
||||
enabled=true
|
||||
[smtp.setup]
|
||||
# Public configuration for SMTP MDA, needed for mobileconfig files
|
||||
hostname="${var.sub-domain}.${var.domain_name}"
|
||||
hostname="${var.sub_domain}.${var.domain_name}"
|
||||
secure=true
|
||||
port=465
|
||||
[webhooks]
|
||||
@@ -312,7 +312,7 @@ resource "kubernetes_config_map_v1" "wildduck_config" {
|
||||
autoExpunge=true
|
||||
[setup]
|
||||
# Public configuration for IMAP
|
||||
hostname="${var.sub-domain}.${var.domain_name}"
|
||||
hostname="${var.sub_domain}.${var.domain_name}"
|
||||
secure=true
|
||||
# port defaults to imap.port
|
||||
port=9930
|
||||
@@ -360,7 +360,7 @@ resource "kubernetes_config_map_v1" "wildduck_config" {
|
||||
cert="/var/opt/certs/tls.crt"
|
||||
[setup]
|
||||
# Public configuration for POP3
|
||||
hostname="${var.sub-domain}.${var.domain_name}"
|
||||
hostname="${var.sub_domain}.${var.domain_name}"
|
||||
secure=true
|
||||
# port defaults to pop3.port
|
||||
port=995
|
||||
|
||||
@@ -128,7 +128,7 @@ resource "kubernetes_config_map_v1" "zonemta_config" {
|
||||
# Server process must be able to locally bind to these addresses
|
||||
[[default]]
|
||||
address="0.0.0.0"
|
||||
name="${var.sub-domain}.${var.domain_name}"
|
||||
name="${var.sub_domain}.${var.domain_name}"
|
||||
#
|
||||
#[[default]]
|
||||
#address="1.2.3.5"
|
||||
@@ -145,7 +145,7 @@ resource "kubernetes_config_map_v1" "zonemta_config" {
|
||||
interfaces=["feeder"]
|
||||
# optional hostname to be used in headers
|
||||
# defaults to os.hostname()
|
||||
hostname="${var.sub-domain}.${var.domain_name}"
|
||||
hostname="${var.sub_domain}.${var.domain_name}"
|
||||
# How long to keep auth records in log
|
||||
authlogExpireDays=30
|
||||
# default smtp recipients for 24h (can be overriden per user)
|
||||
|
||||
Reference in New Issue
Block a user