From 654cf500f9082ae535de282b082afb596c11c25e Mon Sep 17 00:00:00 2001 From: Alexandre Pires Date: Sun, 27 Apr 2025 19:12:07 +0200 Subject: [PATCH] feat: Implement MariaDB and backup job modules with configuration and secrets management --- terraform/k8sapps/gitea.tf | 4 +-- terraform/k8sapps/mail.tf | 2 +- terraform/k8sapps/nextcloud.tf | 4 +-- .../resources/nginx/conf.d/default.conf | 35 ------------------- terraform/k8sapps/resources/nginx/nginx.conf | 34 ------------------ .../{k8sapps => }/modules/k8s_mariadb/main.tf | 0 .../modules/k8s_mariadb/outputs.tf | 0 .../modules/k8s_mariadb/provider.tf | 0 .../modules/k8s_mariadb/variables.tf | 0 .../modules/scw_backup_job/config.tf | 0 .../modules/scw_backup_job/main.tf | 0 .../modules/scw_backup_job/provider.tf | 0 .../scw_backup_job/resources/rclone.conf | 0 .../modules/scw_backup_job/variables.tf | 0 14 files changed, 5 insertions(+), 74 deletions(-) delete mode 100644 terraform/k8sapps/resources/nginx/conf.d/default.conf delete mode 100644 terraform/k8sapps/resources/nginx/nginx.conf rename terraform/{k8sapps => }/modules/k8s_mariadb/main.tf (100%) rename terraform/{k8sapps => }/modules/k8s_mariadb/outputs.tf (100%) rename terraform/{k8sapps => }/modules/k8s_mariadb/provider.tf (100%) rename terraform/{k8sapps => }/modules/k8s_mariadb/variables.tf (100%) rename terraform/{k8sapps => }/modules/scw_backup_job/config.tf (100%) rename terraform/{k8sapps => }/modules/scw_backup_job/main.tf (100%) rename terraform/{k8sapps => }/modules/scw_backup_job/provider.tf (100%) rename terraform/{k8sapps => }/modules/scw_backup_job/resources/rclone.conf (100%) rename terraform/{k8sapps => }/modules/scw_backup_job/variables.tf (100%) diff --git a/terraform/k8sapps/gitea.tf b/terraform/k8sapps/gitea.tf index 9355351..13912c1 100644 --- a/terraform/k8sapps/gitea.tf +++ b/terraform/k8sapps/gitea.tf @@ -78,7 +78,7 @@ resource "kubernetes_secret" "gitea_mail_credentials" { # Setup MariaDB database # module "gitea_database" { - source = "./modules/k8s_mariadb" + source = "../modules/k8s_mariadb" namespace = kubernetes_namespace.gitea.metadata[0].name app_name = "gitea" @@ -97,7 +97,7 @@ module "gitea_database" { # Setup rsync backup job to scaleway bucket # module "gitea_backup" { - source = "./modules/scw_backup_job" + source = "../modules/scw_backup_job" namespace = kubernetes_namespace.gitea.metadata[0].name app_name = "gitea" diff --git a/terraform/k8sapps/mail.tf b/terraform/k8sapps/mail.tf index fb051ef..8cfe2f7 100644 --- a/terraform/k8sapps/mail.tf +++ b/terraform/k8sapps/mail.tf @@ -209,7 +209,7 @@ resource "kubernetes_manifest" "mail_certificate" { module "mail_backup" { - source = "./modules/scw_backup_job" + source = "../modules/scw_backup_job" namespace = kubernetes_namespace.mail.metadata[0].name app_name = "mail" diff --git a/terraform/k8sapps/nextcloud.tf b/terraform/k8sapps/nextcloud.tf index cd2e02d..f374a1b 100644 --- a/terraform/k8sapps/nextcloud.tf +++ b/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/k8s_mariadb" namespace = kubernetes_namespace.nextcloud.metadata[0].name app_name = "nextcloud" @@ -174,7 +174,7 @@ module "nextcloud_database" { # module "nextcloud_backup" { - source = "./modules/scw_backup_job" + source = "../modules/scw_backup_job" namespace = kubernetes_namespace.nextcloud.metadata[0].name app_name = "nextcloud" diff --git a/terraform/k8sapps/resources/nginx/conf.d/default.conf b/terraform/k8sapps/resources/nginx/conf.d/default.conf deleted file mode 100644 index d352c7b..0000000 --- a/terraform/k8sapps/resources/nginx/conf.d/default.conf +++ /dev/null @@ -1,35 +0,0 @@ -server { - listen 8080; - server_name localhost; - - gzip on; - gzip_comp_level 9; - gzip_types - text/html - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/json - application/xml - application/rss+xml - image/svg+xml; - - root /tmp/site; - - location / { - index index.html index.htm; - } - - location ~* ^/([^/]+) { - index index.html index.htm; - error_page 404 = @error; - } - - error_page 404 /404.html; - location @error { - try_files /$1/404.html /404.html =404; - } -} diff --git a/terraform/k8sapps/resources/nginx/nginx.conf b/terraform/k8sapps/resources/nginx/nginx.conf deleted file mode 100644 index 12c02fa..0000000 --- a/terraform/k8sapps/resources/nginx/nginx.conf +++ /dev/null @@ -1,34 +0,0 @@ -worker_processes auto; - -error_log /var/log/nginx/error.log notice; -pid /tmp/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - proxy_temp_path /tmp/proxy_temp; - client_body_temp_path /tmp/client_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - - keepalive_timeout 65; - - - include /etc/nginx/conf.d/*.conf; -} \ No newline at end of file diff --git a/terraform/k8sapps/modules/k8s_mariadb/main.tf b/terraform/modules/k8s_mariadb/main.tf similarity index 100% rename from terraform/k8sapps/modules/k8s_mariadb/main.tf rename to terraform/modules/k8s_mariadb/main.tf diff --git a/terraform/k8sapps/modules/k8s_mariadb/outputs.tf b/terraform/modules/k8s_mariadb/outputs.tf similarity index 100% rename from terraform/k8sapps/modules/k8s_mariadb/outputs.tf rename to terraform/modules/k8s_mariadb/outputs.tf diff --git a/terraform/k8sapps/modules/k8s_mariadb/provider.tf b/terraform/modules/k8s_mariadb/provider.tf similarity index 100% rename from terraform/k8sapps/modules/k8s_mariadb/provider.tf rename to terraform/modules/k8s_mariadb/provider.tf diff --git a/terraform/k8sapps/modules/k8s_mariadb/variables.tf b/terraform/modules/k8s_mariadb/variables.tf similarity index 100% rename from terraform/k8sapps/modules/k8s_mariadb/variables.tf rename to terraform/modules/k8s_mariadb/variables.tf diff --git a/terraform/k8sapps/modules/scw_backup_job/config.tf b/terraform/modules/scw_backup_job/config.tf similarity index 100% rename from terraform/k8sapps/modules/scw_backup_job/config.tf rename to terraform/modules/scw_backup_job/config.tf diff --git a/terraform/k8sapps/modules/scw_backup_job/main.tf b/terraform/modules/scw_backup_job/main.tf similarity index 100% rename from terraform/k8sapps/modules/scw_backup_job/main.tf rename to terraform/modules/scw_backup_job/main.tf diff --git a/terraform/k8sapps/modules/scw_backup_job/provider.tf b/terraform/modules/scw_backup_job/provider.tf similarity index 100% rename from terraform/k8sapps/modules/scw_backup_job/provider.tf rename to terraform/modules/scw_backup_job/provider.tf diff --git a/terraform/k8sapps/modules/scw_backup_job/resources/rclone.conf b/terraform/modules/scw_backup_job/resources/rclone.conf similarity index 100% rename from terraform/k8sapps/modules/scw_backup_job/resources/rclone.conf rename to terraform/modules/scw_backup_job/resources/rclone.conf diff --git a/terraform/k8sapps/modules/scw_backup_job/variables.tf b/terraform/modules/scw_backup_job/variables.tf similarity index 100% rename from terraform/k8sapps/modules/scw_backup_job/variables.tf rename to terraform/modules/scw_backup_job/variables.tf