fix
This commit is contained in:
@@ -1,30 +1,30 @@
|
||||
locals {
|
||||
app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
|
||||
main-group = format("app-%s", local.app-name)
|
||||
app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
|
||||
main-group = format("app-%s", local.app_name)
|
||||
}
|
||||
data "authentik_group" "akadmin" {
|
||||
name = "authentik Admins"
|
||||
}
|
||||
resource "authentik_group" "groups" {
|
||||
name = local.main-group
|
||||
attributes = jsonencode({"${local.app-name}" = true})
|
||||
attributes = jsonencode({"${local.app_name}" = true})
|
||||
}
|
||||
|
||||
resource "authentik_application" "prj_app" {
|
||||
name = "${var.instance}"
|
||||
slug = "${var.component}-${var.instance}"
|
||||
#protocol_provider = authentik_provider_oauth2.oauth2.id
|
||||
group = var.app-group
|
||||
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" {
|
||||
name = local.main-group
|
||||
expression = <<-EOF
|
||||
attr = request.user.group_attributes()
|
||||
return attr['${local.app-name}'] if '${local.app-name}' in attr else False
|
||||
return attr['${local.app_name}'] if '${local.app_name}' in attr else False
|
||||
EOF
|
||||
}
|
||||
|
||||
|
||||
@@ -96,11 +96,11 @@ 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.domain-name}
|
||||
${var.sub_domain}.${var.domain_name}
|
||||
${var.domain_name}
|
||||
${join("\n ",var.additional-domains)}
|
||||
rspamd.ini: |-
|
||||
host = ${var.instance}-rspamd.${var.namespace}.svc.cluster.local
|
||||
@@ -188,7 +188,7 @@ resource "kubernetes_config_map_v1" "haraka_config" {
|
||||
dkim_sign.ini: |-
|
||||
disabled = true
|
||||
selector = mail
|
||||
domain = ${var.domain-name}
|
||||
domain = ${var.domain_name}
|
||||
headers_to_sign = From, Sender, Reply-To, Subject, Date, Message-ID, To, Cc, MIME-Version
|
||||
wildduck.yaml: |-
|
||||
redis:
|
||||
|
||||
@@ -6,7 +6,7 @@ metadata:
|
||||
name: wildduck
|
||||
description: null
|
||||
options:
|
||||
ingress-class:
|
||||
ingress_class:
|
||||
default: traefik
|
||||
examples:
|
||||
- traefik
|
||||
@@ -255,7 +255,7 @@ options:
|
||||
examples:
|
||||
- your-company
|
||||
type: string
|
||||
app-group:
|
||||
app_group:
|
||||
default: ''
|
||||
examples:
|
||||
- ''
|
||||
@@ -298,7 +298,7 @@ options:
|
||||
default: 2Gi
|
||||
type: string
|
||||
type: object
|
||||
domain-name:
|
||||
domain_name:
|
||||
default: your_company.com
|
||||
examples:
|
||||
- your_company.com
|
||||
@@ -308,7 +308,7 @@ options:
|
||||
examples:
|
||||
- letsencrypt-prod
|
||||
type: string
|
||||
sub-domain:
|
||||
sub_domain:
|
||||
default: mail
|
||||
examples:
|
||||
- mail
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
locals {
|
||||
dns-names = ["${var.sub-domain}.${var.domain-name}"]
|
||||
cert-names = concat(local.dns-names, ["${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 = {
|
||||
"name" = "${var.instance}-webmail"
|
||||
@@ -8,7 +8,7 @@ locals {
|
||||
"number" = 80
|
||||
}
|
||||
}
|
||||
rules = [ for v in local.dns-names : {
|
||||
rules = [ for v in local.dns_names : {
|
||||
"host" = "${v}"
|
||||
"http" = {
|
||||
"paths" = [{
|
||||
@@ -67,10 +67,10 @@ resource "kubectl_manifest" "prj_ingress" {
|
||||
annotations:
|
||||
"traefik.ingress.kubernetes.io/router.middlewares": "${join(",", [for m in local.middlewares : format("%s-%s@kubernetescrd", var.namespace, m)])}"
|
||||
spec:
|
||||
ingressClassName: "${var.ingress-class}"
|
||||
ingressClassName: "${var.ingress_class}"
|
||||
rules: ${jsonencode(local.rules)}
|
||||
tls:
|
||||
- hosts: ${jsonencode(local.dns-names)}
|
||||
- hosts: ${jsonencode(local.dns_names)}
|
||||
secretName: "${var.instance}-cert"
|
||||
EOF
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ resource "kubectl_manifest" "prj_redis" {
|
||||
labels: ${jsonencode(local.redis-labels)}
|
||||
spec:
|
||||
kubernetesConfig:
|
||||
image: "${var.redis.image}"
|
||||
image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}"
|
||||
imagePullPolicy: "IfNotPresent"
|
||||
storage:
|
||||
volumeClaimTemplate:
|
||||
@@ -21,10 +21,10 @@ resource "kubectl_manifest" "prj_redis" {
|
||||
accessModes: ["ReadWriteOnce"]
|
||||
resources:
|
||||
requests:
|
||||
storage: "${var.redis.storage}"
|
||||
storage: "${var.storage.redis}"
|
||||
redisExporter:
|
||||
enabled: ${var.redis.exporter.enabled}
|
||||
image: "${var.redis.exporter.image}"
|
||||
image: "${var.images.redis_exporter.registry}/${var.images.redis_exporter.repository}:${var.images.redis_exporter.tag}"
|
||||
securityContext:
|
||||
runAsUser: 1000
|
||||
fsGroup: 1000
|
||||
|
||||
@@ -55,7 +55,7 @@ resource "kubectl_manifest" "scimgateway_deploy" {
|
||||
- name: "PORT"
|
||||
value: "8880"
|
||||
- name: "WILDDUCK_DOMAIN"
|
||||
value: "${var.domain-name}"
|
||||
value: "${var.domain_name}"
|
||||
- name: "WILDDUCK_API"
|
||||
value: "http://${var.instance}-wildduck-api.${var.namespace}.svc"
|
||||
- name: SEED
|
||||
|
||||
@@ -92,7 +92,7 @@ resource "kubernetes_config_map_v1" "webmail_config" {
|
||||
|
||||
[service]
|
||||
# email domain for new users
|
||||
domain="${var.domain-name}"
|
||||
domain="${var.domain_name}"
|
||||
# default quotas for new users
|
||||
quota=1024
|
||||
recipients=2000
|
||||
@@ -102,7 +102,7 @@ resource "kubernetes_config_map_v1" "webmail_config" {
|
||||
allowJoin=false
|
||||
enableSpecial=false # if true the allow creating addresses with special usernames
|
||||
# allowed domains for new addresses
|
||||
domains=["${var.domain-name}"]
|
||||
domains=["${var.domain_name}"]
|
||||
|
||||
generalNotification="" # static notification to show on top of the page
|
||||
|
||||
@@ -145,7 +145,7 @@ resource "kubernetes_config_map_v1" "webmail_config" {
|
||||
# set to false if not using HTTPS
|
||||
enabled=true
|
||||
# must be https url or use default
|
||||
appId="https://${var.domain-name}"
|
||||
appId="https://${var.domain_name}"
|
||||
|
||||
[log]
|
||||
level="silly"
|
||||
@@ -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)
|
||||
@@ -161,7 +161,7 @@ resource "kubernetes_config_map_v1" "zonemta_config" {
|
||||
# SRS secret value. Must be the same as in the MX side
|
||||
secret="${local.secrets.srs}"
|
||||
# SRS domain, must resolve back to MX
|
||||
rewriteDomain="${var.domain-name}"
|
||||
rewriteDomain="${var.domain_name}"
|
||||
# DKIM Settings
|
||||
# -------------
|
||||
["modules/zonemta-wildduck".dkim]
|
||||
|
||||
Reference in New Issue
Block a user