From 22361df07dd8f1638c95c576e60cfc8f86456bea Mon Sep 17 00:00:00 2001
From: Alexandre Pires <c.alexandre.pires@gmail.com>
Date: Sat, 25 Jan 2025 16:08:39 +0100
Subject: [PATCH] Refactor Nextcloud Terraform configuration; update database
 and backup paths

---
 .../{nextcloud.tf.bak => nextcloud.tf}        | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)
 rename terraform/k8sapps/{nextcloud.tf.bak => nextcloud.tf} (93%)

diff --git a/terraform/k8sapps/nextcloud.tf.bak b/terraform/k8sapps/nextcloud.tf
similarity index 93%
rename from terraform/k8sapps/nextcloud.tf.bak
rename to terraform/k8sapps/nextcloud.tf
index 9479002..cd2e02d 100644
--- a/terraform/k8sapps/nextcloud.tf.bak
+++ b/terraform/k8sapps/nextcloud.tf
@@ -77,8 +77,9 @@ locals {
     }
   }
 
-  nextcloud_path       = "${local.persistent_folder}/nextcloud"
-  nextcloud_mysql_path = "${local.persistent_folder}/mysql.nextcloud"
+  nextcloud_path        = "${local.persistent_folder}/nextcloud"
+  nextcloud_db_path     = "${local.database_folder}/mysql.nextcloud"
+  nextcloud_backup_path = "${local.persistent_folder}/backup.gitea"
 }
 
 #
@@ -155,16 +156,17 @@ resource "kubernetes_config_map" "nextcloud_apache_config" {
 module "nextcloud_database" {
   source = "./modules/k8s_mariadb"
 
-  namespace         = kubernetes_namespace.nextcloud.metadata[0].name
-  app_name          = "nextcloud"
-  app_backup_folder = "nextcloud.backups"
+  namespace = kubernetes_namespace.nextcloud.metadata[0].name
+  app_name  = "nextcloud"
 
   app_password  = var.nextcloud_mysql_password
   root_password = var.mysql_root_password
 
-  retention_days    = local.local_backup_retention_days
-  cron_schedule     = local.nextcloud_sql_backup_cron_schedule
-  host_storage_path = local.nextcloud_mysql_path
+  retention_days = local.local_backup_retention_days
+  cron_schedule  = local.nextcloud_sql_backup_cron_schedule
+
+  database_folder = local.nextcloud_db_path
+  backup_folder   = local.nextcloud_backup_path
 }
 
 #
@@ -174,10 +176,8 @@ module "nextcloud_backup" {
 
   source = "./modules/scw_backup_job"
 
-  namespace         = kubernetes_namespace.nextcloud.metadata[0].name
-  app_name          = "nextcloud"
-  app_files_folder  = "nextcloud"
-  app_backup_folder = "mysql.nextcloud/nextcloud.backups"
+  namespace = kubernetes_namespace.nextcloud.metadata[0].name
+  app_name  = "nextcloud"
 
   scaleway_organization_id = var.scaleway_organization_id
   scaleway_project_id      = var.scaleway_organization_id
@@ -185,9 +185,11 @@ module "nextcloud_backup" {
   secret_key               = scaleway_iam_api_key.backup_app_api.secret_key
   bucket_name              = scaleway_object_bucket.backup.name
 
-  retention_days    = local.local_backup_retention_days
-  cron_schedule     = local.nextcloud_files_backup_cron_schedule
-  host_storage_path = local.persistent_folder
+  retention_days = local.local_backup_retention_days
+  cron_schedule  = local.nextcloud_files_backup_cron_schedule
+
+  source_folder = local.nextcloud_path
+  target_folder = local.nextcloud_backup_path
 }
 
 #