diff --git a/module.tf b/module.tf index fbd95bd..c344e8d 100644 --- a/module.tf +++ b/module.tf @@ -95,11 +95,11 @@ variable "database_backup_info" { } mysql = { image = "mysql" - command = "mariadb-dump -h $DB_HOST -u $MYSQL_USER -p$MYSQL_ROOT_PASSWORD $MYSQL_DATABASE |gzip -9 > /backup/$(DB_DATABASE_NAME)-DB-$(date +%Y%m%d).sql.gz" + command = "mysqldump -h $DB_HOST -u $MYSQL_USER -p$MYSQL_ROOT_PASSWORD $MYSQL_DATABASE |gzip -9 > /backup/$(DB_DATABASE_NAME)-DB-$(date +%Y%m%d).sql.gz" } sqlserver = { - image = "sqlserver" - command = "sqlserver backup" + image = "mcr.microsoft.com/mssql-tools" + command = "/opt/mssql-tools/bin/sqlcmd -S $DB_HOST -U $DB_USERNAME -P $DB_PASSWORD -Q \"BACKUP DATABASE $DB_DATABASE_NAME TO DISK = '/tmp/SQLTestDB.bak' WITH COPY_ONLY, CHECKSUM,FORMAT, MEDIANAME = 'SQLServerBackups',NAME = 'Full Backup of SQLTestDB'\"" } } @@ -1030,7 +1030,7 @@ resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_host" { for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true } key = "${each.key}__db__host" project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd" - value = "${each.key}-db-svc.${coalesce(each.value.namespace, each.value.connected_namespace, each.key)}.svc" + value = try(each.value.database.host, "${each.key}-db-svc.${coalesce(each.value.namespace, each.value.connected_namespace, each.key)}.svc") } resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_port" { diff --git a/variables.auto.tfvars b/variables.auto.tfvars index e368636..c9da746 100644 --- a/variables.auto.tfvars +++ b/variables.auto.tfvars @@ -1,7 +1,7 @@ kubernetes = { bookstack = { #enabled = false - replicas = 01 + replicas = 01 image = "linuxserver/bookstack:latest" service_port = [80, 443] database = { @@ -12,7 +12,7 @@ kubernetes = { username = "bookstack_username" name = "bookstackapp" } - config_map_ref = ["config"] + config_map_ref = ["config"] secret_ref = ["bookstack-credentials"] config_map_import = ["bb9a8965-994a-4fea-9411-b4020182fa78"] secret_import = ["d1c2b8c9-71a0-4e47-9d9d-b402018376b6"] @@ -2287,6 +2287,9 @@ kubernetes = { database = { "shunt" = "true" "engine" = "sqlserver" + username = "sa" + host = "bitwarden-mssql-svc" + name = "bitwarden_vault" } pvc = {