diff --git a/.drone.yml b/.drone.yml index e1a07540..01014587 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,10 +3,12 @@ type: kubernetes name: default trigger: event: - - cron - - push - cron: - - build-state-daily + include: + # - cron + - push + # target: + # include: + # - build-state-daily steps: - name: Prepare terraform files @@ -39,6 +41,10 @@ steps: kind: pipeline type: kubernetes name: build-cli +trigger: + event: + include: + - push steps: - name: Build image diff --git a/modules/kubernetes/drone/main.tf b/modules/kubernetes/drone/main.tf index f7ab0958..2f44e3ca 100644 --- a/modules/kubernetes/drone/main.tf +++ b/modules/kubernetes/drone/main.tf @@ -105,6 +105,10 @@ resource "kubernetes_deployment" "drone_server" { name = "DRONE_USER_FILTER" value = var.allowed_users } + env { + name = "DRONE_CRON_INTERVAL" + value = "1m" + } } volume { diff --git a/modules/kubernetes/mailserver/extra/aliases.txt b/modules/kubernetes/mailserver/extra/aliases.txt new file mode 100644 index 00000000..caa26064 --- /dev/null +++ b/modules/kubernetes/mailserver/extra/aliases.txt @@ -0,0 +1 @@ +# Add aliases here. Example: 'test@viktorbarzin.me me@viktorbarzin.me' will point test@ -> me@ diff --git a/modules/kubernetes/mailserver/main.tf b/modules/kubernetes/mailserver/main.tf index c8254454..107665c0 100644 --- a/modules/kubernetes/mailserver/main.tf +++ b/modules/kubernetes/mailserver/main.tf @@ -64,7 +64,7 @@ resource "kubernetes_config_map" "mailserver_config" { # Actual mail settings "postfix-accounts.cf" = local.postfix_accounts_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" SigningTable = "*@viktorbarzin.me mail._domainkey.viktorbarzin.me\n" diff --git a/terraform.tfstate b/terraform.tfstate index de070554..0642e49c 100644 Binary files a/terraform.tfstate and b/terraform.tfstate differ