Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: redeploy m0 #107

Merged
merged 1 commit into from
Jan 9, 2025
Merged

chore: redeploy m0 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 22 additions & 21 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,6 @@ module "invoicing" {
acme_account_key = module.common.acme_account_key
}


module "vaultwarden" {
source = "./modules/vaultwarden"
admin_api_key = module.keyvault.secrets["vaultwarden-api-key"]
Expand All @@ -383,26 +382,7 @@ module "vaultwarden" {
dkim_selector = "s1"
dkim_key = "k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDI4os0RXkOmE7+FJGIYDdUFmzGlmmXPzyvvyuCRUzeOBCBiHQQKTqDULecVmbtuROXA2cVBqjZyxHPVcvLLtPOTJYEUTrZ7xpkLDJmtPUIn5iPqXDMbv7QG/XbXN1njRCC9GUPcNvHTocNXe8ZwTK92Ax/l586bLyIzfBUR+yfQQIDAQAB"
}
# module "m0" {
# source = "./modules/m0"
# resource_group_location = local.resource_group_location
# acme_account_key = module.common.acme_account_key
# app_service_plan_id = module.common.tikweb_app_plan_id
# web_resource_group_name = module.common.resource_group_name
# mail_dns_resource_group_name = module.dns_prod.resource_group_name
# postgres_server_fqdn = module.common.postgres_server_fqdn
# postgres_admin_password = module.common.postgres_admin_password
# postgres_server_id = module.common.postgres_server_id
# dkim_key = "k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7Ho1FBsK9IyD0dl7gA/fh8vA1abuLrgB/e//bIrcFb8NS/Ze3W2cMUHZ7T3UvjnjlPhutWMblBX39oFBj9jp+lFpy+AwKSYBz7GZ/WCdZTsN01U6miUGiMEdfB/pOmIXKJKtkT9wHk7RJkRl9MTnUY60UgVweZFfdJbAnMXNKvulEZAEsKlE+8M5qDJDvnGNs99/wDl9nam5KyGPFLTzxeBSlsEQo6qa5qPcmn3vxbgVlwrFDt9KmbFcgAbq3wZ+W0MwwL54wPZVmHCwObi4sIptokmZVlmaXyvTwJ8eklrwJD51TLlpinwNBUpvgFGWDC62nLLt3wOHFSadtuxWCwIDAQAB"
# dkim_selector = "email"
# mail_subdomain = "m0"
# smtp_email = module.keyvault.m0_smtp_email
# smtp_password = module.keyvault.m0_smtp_password
# mail_dns_zone_name = module.dns_prod.root_zone_name
# strapi_token = module.keyvault.muistinnollaus_strapi_token
# muistinnollaus_paytrail_merchant_id = module.keyvault.muistinnollaus_paytrail_merchant_id
# muistinnollaus_paytrail_secret_key = module.keyvault.muistinnollaus_paytrail_secret_key
# }

module "github-ci-roles" {
source = "./modules/github-ci"
repo_app_service_map = {
Expand All @@ -428,3 +408,24 @@ output "github_actions_azure_tenant_id" {
description = "AZURE_TENANT_ID in Github Actions"
value = module.github-ci-roles.azure_tenant_id
}

module "m0" {
source = "./modules/m0"
resource_group_location = local.resource_group_location
acme_account_key = module.common.acme_account_key
app_service_plan_id = module.common.tikweb_app_plan_id
web_resource_group_name = module.common.resource_group_name
mail_dns_resource_group_name = module.dns_prod.resource_group_name
postgres_server_fqdn = module.common.postgres_server_fqdn
postgres_admin_password = module.common.postgres_admin_password
postgres_server_id = module.common.postgres_server_id
dkim_key = "k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7Ho1FBsK9IyD0dl7gA/fh8vA1abuLrgB/e//bIrcFb8NS/Ze3W2cMUHZ7T3UvjnjlPhutWMblBX39oFBj9jp+lFpy+AwKSYBz7GZ/WCdZTsN01U6miUGiMEdfB/pOmIXKJKtkT9wHk7RJkRl9MTnUY60UgVweZFfdJbAnMXNKvulEZAEsKlE+8M5qDJDvnGNs99/wDl9nam5KyGPFLTzxeBSlsEQo6qa5qPcmn3vxbgVlwrFDt9KmbFcgAbq3wZ+W0MwwL54wPZVmHCwObi4sIptokmZVlmaXyvTwJ8eklrwJD51TLlpinwNBUpvgFGWDC62nLLt3wOHFSadtuxWCwIDAQAB"
dkim_selector = "email"
mail_subdomain = "m0"
smtp_email = module.keyvault.secrets["muistinnollaus-smtp-email"]
smtp_password = module.keyvault.secrets["muistinnollaus-smtp-password"]
mail_dns_zone_name = module.dns_prod.root_zone_name
strapi_token = module.keyvault.secrets["muistinnollaus-strapi-token"]
muistinnollaus_paytrail_merchant_id = module.keyvault.secrets["muistinnollaus-paytrail-merchant-id"]
muistinnollaus_paytrail_secret_key = module.keyvault.secrets["muistinnollaus-paytrail-secret-key"]
}
Loading