refactor: simplify project structure

modules/20-services-apps/emulatorjs/main.tf

@@ -1,70 +1,78 @@
-// EmulatorJS module for retro game emulation
-// This module configures an EmulatorJS container with the specified volumes
+terraform {
+  required_providers {
+    dotenv = {
+      source = "germanbrew/dotenv"
+    }
+  }
+}
+
+variable "image_tag" {
+  description = "The tag for the EmulatorJS container image"
+  type        = string
+  default     = "latest"
+}
+
+variable "volume_path" {
+  description = "Base directory for volumes"
+  type        = string
+}
 
 locals {
-  container_name = var.container_name != "" ? var.container_name : "emulatorjs"
+  container_name = "emulatorjs"
+  image          = "linuxserver/emulatorjs"
   image_tag      = var.image_tag != "" ? var.image_tag : "latest"
-  
-  default_env_vars = {
-    TZ           = var.timezone
-  }
-  
-  // Merge default env vars with any additional ones provided
-  env_vars = merge(local.default_env_vars, var.additional_env_vars)
-  
-  // Default volumes for EmulatorJS
-  default_volumes = [
+  monitoring     = true
+  env_file       = "${path.module}/.env"
+  frontend_port  = provider::dotenv::get_by_key("EMULATORJS_FRONTEND_PORT", local.env_file)
+  config_port    = provider::dotenv::get_by_key("EMULATORJS_CONFIG_PORT", local.env_file)
+  backend_port   = provider::dotenv::get_by_key("EMULATORJS_BACKEND_PORT", local.env_file)
+  ports = [
     {
-      host_path      = var.config_volume_path
+      internal = 3000
+      external = local.config_port
+      protocol = "tcp"
+    },
+    {
+      internal = 80
+      external = local.frontend_port
+      protocol = "tcp"
+    },
+    {
+      internal = 4001
+      external = local.backend_port
+      protocol = "tcp"
+    }
+  ]
+  volumes = [
+    {
+      host_path      = "${var.volume_path}/config"
       container_path = "/config"
       read_only      = false
     },
     {
-      host_path      = var.data_volume_path
+      host_path      = "${var.volume_path}/data"
       container_path = "/data"
       read_only      = false
     }
   ]
-  
-  // Merge default volumes with any additional ones provided
-  volumes = concat(local.default_volumes, var.additional_volumes)
 }
 
-// Use the generic docker-service module to deploy EmulatorJS
 module "emulatorjs" {
   source = "../../10-services-generic/docker-service"
 
-  container_name  = local.container_name
-  image           = "linuxserver/emulatorjs"
-  tag             = local.image_tag
-  
-  restart_policy  = var.restart_policy
-  network_mode    = "bridge"
-  
-  env_vars        = local.env_vars
-  volumes         = local.volumes
-  
-  labels          = var.labels
-  
-  // Default ports for EmulatorJS
-  ports           = [
-    {
-      internal    = 3000
-      external    = var.config_port
-      protocol    = "tcp"
-    },
-    {
-      internal    = 80
-      external    = var.frontend_port
-      protocol    = "tcp"
-    },
-    {
-      internal    = 4001
-      external    = var.backend_port
-      protocol    = "tcp"
-    }
-  ]
-  
-  // Enable monitoring for the container via Watchtower
-  monitoring      = var.monitoring
+  container_name = local.container_name
+  image          = local.image
+  tag            = local.image_tag
+  volumes        = local.volumes
+  ports          = local.ports
+  monitoring     = local.monitoring
+}
+
+output "service_definition" {
+  description = "General service definition with optional ingress configuration"
+  value = {
+    name         = module.emulatorjs.container_name
+    primary_port = local.frontend_port
+    endpoint     = "http://${module.emulatorjs.container_name}:${local.frontend_port}"
+  }
 }