Reorganized folder structure

terraform/k8sapps/apps.tf

@@ -1,11 +1,11 @@
 module "websites" {
-  source            = "../modules/nginx"
+  source            = "../modules/apps/nginx"
   persistent_folder = local.persistent_folder
   websites          = local.websites
 }
 
 module "rustdesk" {
-  source = "../modules/rustdesk"
+  source = "../modules/apps/rustdesk"
 
   persistent_folder = local.persistent_folder
   fqdn              = local.rustdesk_fqdn
@@ -14,7 +14,7 @@ module "rustdesk" {
 }
 
 module "m3uproxy" {
-  source = "../modules/m3uproxy"
+  source = "../modules/apps/m3uproxy"
 
   persistent_folder = local.persistent_folder
   tag               = local.m3uproxy_version
@@ -36,7 +36,7 @@ module "m3uproxy" {
 }
 
 module "mail" {
-  source = "../modules/mail"
+  source = "../modules/apps/mail"
 
   persistent_folder = local.persistent_folder
 
@@ -55,7 +55,7 @@ module "mail" {
 }
 
 module "gitea" {
-  source = "../modules/gitea"
+  source = "../modules/apps/gitea"
 
   persistent_folder = local.persistent_folder
   database_folder   = local.database_folder

terraform/k8sapps/backups.tf

@@ -1,6 +1,6 @@
 module "mail_backup" {
 
-  source = "../modules/scw_backup_job"
+  source = "../modules/utils/scw_rclone"
 
   namespace = module.mail.namespace
   app_name  = module.mail.app_name
@@ -19,7 +19,7 @@ module "mail_backup" {
 }
 
 module "gitea_backup" {
-  source = "../modules/scw_backup_job"
+  source = "../modules/utils/scw_rclone"
 
   namespace = module.gitea.namespace
   app_name  = module.gitea.app_name
@@ -39,7 +39,7 @@ module "gitea_backup" {
 
 module "nextcloud_backup" {
 
-  source = "../modules/scw_backup_job"
+  source = "../modules/utils/scw_rclone"
 
   namespace = kubernetes_namespace.nextcloud.metadata[0].name
   app_name  = "nextcloud"

terraform/k8sapps/nextcloud.tf

@@ -154,7 +154,7 @@ resource "kubernetes_config_map" "nextcloud_apache_config" {
 # Setup MariaDB database
 #
 module "nextcloud_database" {
-  source = "../modules/k8s_mariadb"
+  source = "../modules/db/mariadb"
 
   namespace = kubernetes_namespace.nextcloud.metadata[0].name
   app_name  = "nextcloud"

terraform/modules/apps/gitea/main.tf

@@ -25,7 +25,7 @@ resource "kubernetes_secret" "gitea_mail_credentials" {
 }
 
 module "gitea_database" {
-  source = "../k8s_mariadb"
+  source = "../../db/mariadb"
 
   namespace = kubernetes_namespace.gitea.metadata[0].name
   app_name  = "gitea"
@@ -40,7 +40,6 @@ module "gitea_database" {
   backup_folder   = var.backup_folder
 }
 
-
 resource "kubernetes_service_account" "gitea_service_account" {
 
   metadata {

terraform/modules/mail/lib/bcrypt_hash.py

@@ -1,27 +0,0 @@
-import sys
-import json
-import bcrypt
-import binascii
-
-# Read input JSON from stdin
-input_data = json.load(sys.stdin)
-password = input_data.get("password")
-cost = int(input_data.get("cost", "10")) # Default cost 10
-
-if not password:
-    print(json.dumps({"error": "Password is required"}), file=sys.stderr)
-    sys.exit(1)
-
-# Generate bcrypt hash
-hashed_bytes = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt(rounds=cost))
-hashed_string = hashed_bytes.decode('utf-8')
-
-# Hex encode for Glauth
-hex_encoded_hash = binascii.hexlify(hashed_string.encode('utf-8')).decode('utf-8')
-
-# Output JSON to stdout
-output_data = {
-    "bcrypt_hash": hashed_string,
-    "hex_encoded_bcrypt_hash": hex_encoded_hash
-}
-print(json.dumps(output_data))