reduce drone interval check and add the additional email aliases inclusion
This commit is contained in:
parent
90a43e99f5
commit
12a3a33ba3
5 changed files with 16 additions and 5 deletions
14
.drone.yml
14
.drone.yml
|
|
@ -3,10 +3,12 @@ type: kubernetes
|
||||||
name: default
|
name: default
|
||||||
trigger:
|
trigger:
|
||||||
event:
|
event:
|
||||||
- cron
|
include:
|
||||||
- push
|
# - cron
|
||||||
cron:
|
- push
|
||||||
- build-state-daily
|
# target:
|
||||||
|
# include:
|
||||||
|
# - build-state-daily
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Prepare terraform files
|
- name: Prepare terraform files
|
||||||
|
|
@ -39,6 +41,10 @@ steps:
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: kubernetes
|
type: kubernetes
|
||||||
name: build-cli
|
name: build-cli
|
||||||
|
trigger:
|
||||||
|
event:
|
||||||
|
include:
|
||||||
|
- push
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Build image
|
- name: Build image
|
||||||
|
|
|
||||||
|
|
@ -105,6 +105,10 @@ resource "kubernetes_deployment" "drone_server" {
|
||||||
name = "DRONE_USER_FILTER"
|
name = "DRONE_USER_FILTER"
|
||||||
value = var.allowed_users
|
value = var.allowed_users
|
||||||
}
|
}
|
||||||
|
env {
|
||||||
|
name = "DRONE_CRON_INTERVAL"
|
||||||
|
value = "1m"
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
volume {
|
volume {
|
||||||
|
|
|
||||||
1
modules/kubernetes/mailserver/extra/aliases.txt
Normal file
1
modules/kubernetes/mailserver/extra/aliases.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
# Add aliases here. Example: 'test@viktorbarzin.me me@viktorbarzin.me' will point test@ -> me@
|
||||||
|
|
@ -64,7 +64,7 @@ resource "kubernetes_config_map" "mailserver_config" {
|
||||||
# Actual mail settings
|
# Actual mail settings
|
||||||
"postfix-accounts.cf" = local.postfix_accounts_cf
|
"postfix-accounts.cf" = local.postfix_accounts_cf
|
||||||
"postfix-main.cf" = var.postfix_cf
|
"postfix-main.cf" = var.postfix_cf
|
||||||
"postfix-virtual.cf" = var.postfix_account_aliases
|
"postfix-virtual.cf" = format("%s%s", var.postfix_account_aliases, file("${path.module}/extra/aliases.txt"))
|
||||||
|
|
||||||
KeyTable = "mail._domainkey.viktorbarzin.me viktorbarzin.me:mail:/etc/opendkim/keys/viktorbarzin.me-mail.key\n"
|
KeyTable = "mail._domainkey.viktorbarzin.me viktorbarzin.me:mail:/etc/opendkim/keys/viktorbarzin.me-mail.key\n"
|
||||||
SigningTable = "*@viktorbarzin.me mail._domainkey.viktorbarzin.me\n"
|
SigningTable = "*@viktorbarzin.me mail._domainkey.viktorbarzin.me\n"
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue