- Added windows llama proxy

- Added terraform-mcp
- Added S3 storage to gitea
- Changed context size for windows LLMs
- Changed number of cores for VMs, added P2000 support

terraform/apps/dev-01/apps.tf

@@ -43,6 +43,14 @@ module "nextcloud" {
   issuer      = local.internal_issuer
 }
 
+module "llama_windows_proxy" {
+  source = "../../modules/utils/wol_proxy"
+
+  upstream   = local.llm_proxy_1
+  proxy_port = 11435
+  namespace  = "llamacpp"
+}
+
 # module "comfyui_proxy" {
 #   source = "../../modules/utils/wol_proxy"
 
@@ -122,3 +130,11 @@ module "vaultwarden" {
   # signup_enabled = true
   # signup_verify  = false
 }
+
+module "terraform-mcp" {
+  source = "../../modules/apps/terraform-mcp"
+
+  fqdn              = local.terraform_mcp_fqdn
+  tag               = "1.0.0"
+  persistent_folder = local.persistent_folder
+}

terraform/apps/dev-01/config.tf

@@ -126,6 +126,11 @@ locals {
           name    = "vaultwarden"
           type    = "CNAME"
           content = "dev-01.${local.lab_domain}."
+        },
+        {
+          name    = "terraform-mcp"
+          type    = "CNAME"
+          content = "dev-01.${local.lab_domain}."
         }
       ]
     }
@@ -179,6 +184,14 @@ locals {
     scheme  = "http"
   }
 
+  llm_proxy_1 = {
+    enabled = true
+    mac     = "52:54:00:CD:DD:2E"
+    ip      = "10.19.4.207"
+    port    = 11434
+    scheme  = "http"
+  }
+
   # comfyui_proxy = {
   #   mac    = "04:7c:16:d6:63:66"
   #   ip     = "10.19.4.106"
@@ -267,6 +280,9 @@ locals {
   vaultwarden_smtp_from_name = "Vaultwarden"
   vaultwarden_smtp_username  = var.scaleway_project_id
   vaultwarden_smtp_password  = local.mail_app_api_secret_key
+
+  # terraform-mcp
+  terraform_mcp_fqdn = "terraform-mcp.${local.lab_domain}"
 }
 
 data "terraform_remote_state" "scaleway" {

terraform/apps/dev-01/sectool.json

@@ -0,0 +1 @@
+../../../sectool.json

terraform/apps/prod-01/apps.tf

@@ -89,6 +89,7 @@ module "gitea" {
     smtp_passwd          = local.mail_app_api_secret_key
     secret_key           = var.gitea_secret_key
     internal_token       = var.gitea_internal_token
+    s3_storage           = join("\n", [for k, v in local.gitea_s3_storage : "${k}=${v}"])
     disable_registration = true
   }
 }
@@ -157,24 +158,3 @@ module "auth_exporter" {
   source            = "../../modules/utils/auth-exporter"
   persistent_folder = "${local.persistent_folder}/monitoring"
 }
-
-module "vaultwarden" {
-  source = "../../modules/apps/vaultwarden"
-
-  persistent_folder   = local.vaultwarden_folder
-  fqdn                = local.vaultwarden_fqdn
-  issuer              = local.vaultwarden_issuer
-  tag                 = local.vaultwarden_version
-  admin_token         = var.vaultwarden_admin_token
-  smtp_host           = local.vaultwarden_smtp_host
-  smtp_port           = local.vaultwarden_smtp_port
-  smtp_security       = local.vaultwarden_smtp_security
-  smtp_from           = local.vaultwarden_smtp_from
-  smtp_from_name      = local.vaultwarden_smtp_from_name
-  smtp_username       = local.vaultwarden_smtp_username
-  smtp_password       = var.vaultwarden_smtp_password
-  smtp_timeout        = local.vaultwarden_smtp_timeout
-  smtp_auth_mechanism = local.vaultwarden_smtp_auth_mechanism
-  smtp_helo_name      = local.vaultwarden_smtp_helo_name
-  smtp_embed_images   = local.vaultwarden_smtp_embed_images
-}

terraform/apps/prod-01/config.tf

@@ -18,8 +18,17 @@ locals {
   }
 
   # gitea
-  gitea_version = "1.25-rootless"
+  gitea_version = "1.26-rootless"
   gitea_fqdn    = "code.${local.primary_domain}"
+  gitea_s3_storage = {
+    STORAGE_TYPE            = "minio"
+    MINIO_ENDPOINT          = "s3.fr-par.scw.cloud"
+    MINIO_ACCESS_KEY_ID     = data.terraform_remote_state.scaleway.outputs.gitea_app_api_access_key
+    MINIO_SECRET_ACCESS_KEY = data.terraform_remote_state.scaleway.outputs.gitea_app_api_secret_key
+    MINIO_BUCKET            = data.terraform_remote_state.scaleway.outputs.gitea_bucket_name
+    MINIO_LOCATION          = "fr-par"
+    MINIO_USE_SSL           = true
+  }
 
   # sftpgo
   sftpgo_version = "2.6.x"
@@ -210,22 +219,6 @@ locals {
   # telegram_chat_id = "-950480346" # alexpires.me group
   telegram_message = file("${path.module}/resources/telegram.tpl")
 
-  # vaultwarden
-  vaultwarden_folder              = "${local.persistent_folder}/vaultwarden"
-  vaultwarden_fqdn                = "vaultwarden.${local.primary_domain}"
-  vaultwarden_issuer              = "internal-ca"
-  vaultwarden_version             = "1.36.0"
-  vaultwarden_smtp_host           = ""
-  vaultwarden_smtp_port           = 587
-  vaultwarden_smtp_security       = "starttls"
-  vaultwarden_smtp_from           = ""
-  vaultwarden_smtp_from_name      = "Vaultwarden"
-  vaultwarden_smtp_username       = ""
-  vaultwarden_smtp_timeout        = 15
-  vaultwarden_smtp_auth_mechanism = ""
-  vaultwarden_smtp_helo_name      = ""
-  vaultwarden_smtp_embed_images   = true
-
   # get secrets from remote state
   backup_bucket_name        = data.terraform_remote_state.scaleway.outputs.backup_bucket_name
   backup_app_api_secret_key = data.terraform_remote_state.scaleway.outputs.backup_app_api_secret_key

terraform/apps/prod-01/secrets.tf

@@ -134,16 +134,3 @@ variable "telegram_bot_token" {
   type        = string
   sensitive   = true
 }
-
-variable "vaultwarden_admin_token" {
-  description = "The admin token for VaultWarden"
-  type        = string
-  sensitive   = true
-}
-
-variable "vaultwarden_smtp_password" {
-  description = "SMTP password for VaultWarden email"
-  type        = string
-  sensitive   = true
-  default     = ""
-}

terraform/apps/prod-01/sectool.env

@@ -33,5 +33,3 @@ TF_VAR_wireguard_1_public_key=$WIREGUARD_1_PUBLIC_KEY
 TF_VAR_wireguard_1_pre_shared_key=$WIREGUARD_1_PRE_SHARED_KEY
 TF_VAR_nginx_token_bearer=$NGINX_TOKEN_BEARER
 TF_VAR_telegram_bot_token=$TELEGRAM_BOT_TOKEN
-TF_VAR_vaultwarden_admin_token=$VAULTWARDEN_ADMIN_TOKEN
-TF_VAR_vaultwarden_smtp_password=$VAULTWARDEN_SMTP_PASSWORD

terraform/apps/prod-01/sectool.json

@@ -0,0 +1 @@
+../../../sectool.json