fix: [#14] resolve yamllint validation warnings in config scripts

- Fix validate-config.sh to skip yamllint for files in application/storage/
- Use basic Python YAML validation for ignored directories instead
- Fix grep pattern for template variable validation (avoid curly brace errors)
- Add docker-compose.env.tpl template for Docker Compose environment
- Update environment files with all required variables for production
- Ensure validation works correctly for both local and production environments

All linting checks now pass without warnings while respecting project ignore rules.

Author: josecelano

Makefile

@@ -1,5 +1,5 @@
 # Makefile for Torrust Tracker Local Testing Infrastructure
-.PHONY: help init plan apply destroy test clean status refresh-state ssh install-deps console vm-console lint lint-yaml lint-shell lint-markdown
+.PHONY: help init plan apply destroy test clean status refresh-state ssh install-deps console vm-console lint lint-yaml lint-shell lint-markdown configure-local configure-production validate-config validate-config-production deploy-local deploy-production start-services stop-services
 
 # Default variables
 VM_NAME ?= torrust-tracker-demo
@@ -342,3 +342,61 @@ vm-console: ## Access VM graphical console (GUI)
 		echo "virt-viewer not found. Please install it:"; \
 		echo "  sudo apt install virt-viewer"; \
 	fi
+
+# Configuration Management Targets
+configure-local: ## Generate local environment configuration
+	@echo "Generating local environment configuration..."
+	@infrastructure/scripts/configure-env.sh local
+
+configure-production: ## Generate production environment configuration (requires secrets)
+	@echo "Generating production environment configuration..."
+	@infrastructure/scripts/configure-env.sh production
+
+validate-config: ## Validate generated configuration files
+	@echo "Validating configuration files..."
+	@infrastructure/scripts/validate-config.sh local
+
+validate-config-production: ## Validate production configuration files
+	@echo "Validating production configuration files..."
+	@infrastructure/scripts/validate-config.sh production
+
+# Deployment workflow targets
+deploy-local: configure-local ## Deploy VM and configure for local environment
+	@echo "Deploying local environment..."
+	@$(MAKE) apply
+	@echo "Waiting for VM to be ready..."
+	@sleep 30
+	@echo "Starting application services..."
+	@$(MAKE) start-services
+
+deploy-production: configure-production ## Deploy and configure for production environment (requires secrets)
+	@echo "Deploying production environment..."
+	@$(MAKE) apply
+	@echo "Waiting for VM to be ready..."
+	@sleep 30
+	@echo "Starting application services..."
+	@$(MAKE) start-services
+
+start-services: ## Start Docker Compose services in the VM
+	@echo "Starting Docker Compose services..."
+	@VM_IP=$$(cd $(TERRAFORM_DIR) && tofu output -raw vm_ip 2>/dev/null) || \
+	 VM_IP=$$(virsh domifaddr $(VM_NAME) | grep ipv4 | awk '{print $$4}' | cut -d'/' -f1); \
+	if [ -n "$$VM_IP" ]; then \
+		echo "Starting services on $$VM_IP..."; \
+		ssh -o StrictHostKeyChecking=no torrust@$$VM_IP 'cd /home/torrust/github/torrust/torrust-tracker-demo/application && docker compose up -d'; \
+	else \
+		echo "Could not get VM IP. Is the VM deployed?"; \
+		exit 1; \
+	fi
+
+stop-services: ## Stop Docker Compose services in the VM
+	@echo "Stopping Docker Compose services..."
+	@VM_IP=$$(cd $(TERRAFORM_DIR) && tofu output -raw vm_ip 2>/dev/null) || \
+	 VM_IP=$$(virsh domifaddr $(VM_NAME) | grep ipv4 | awk '{print $$4}' | cut -d'/' -f1); \
+	if [ -n "$$VM_IP" ]; then \
+		echo "Stopping services on $$VM_IP..."; \
+		ssh -o StrictHostKeyChecking=no torrust@$$VM_IP 'cd /home/torrust/github/torrust/torrust-tracker-demo/application && docker compose down'; \
+	else \
+		echo "Could not get VM IP. Is the VM deployed?"; \
+		exit 1; \
+	fi

application/compose.yaml

@@ -108,11 +108,11 @@ services:
     tty: true
     restart: unless-stopped
     environment:
-      - USER_ID=${USER_ID}
+      - USER_ID=${USER_ID:-1000}
       - TORRUST_TRACKER_DATABASE=${TORRUST_TRACKER_DATABASE:-mysql}
-      - TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER=${TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER:-mysql}
-      - TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__PATH=${TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__PATH:-mysql://torrust:password@mysql:3306/torrust_tracker}
-      - TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN=${TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN:-MyAccessToken}
+      - TORRUST_TRACKER_DATABASE_URL=${TORRUST_TRACKER_DATABASE_URL:-mysql://torrust:password@mysql:3306/torrust_tracker}
+      # Configuration file will be loaded from /etc/torrust/tracker/tracker.toml
+      # Generated by infrastructure/scripts/configure-env.sh
     networks:
       - backend_network
     ports:

infrastructure/config/environments/local.env

@@ -40,8 +40,18 @@ TORRUST_TRACKER_HEALTH_CHECK_PORT=1313
 # API Authentication
 TORRUST_TRACKER_API_TOKEN=local-dev-token
 
+# Database Configuration for Docker Compose
+MYSQL_ROOT_PASSWORD=root_password
+MYSQL_DATABASE=torrust_tracker
+MYSQL_USER=torrust
+MYSQL_PASSWORD=password
+TORRUST_TRACKER_DATABASE=mysql
+TORRUST_TRACKER_DATABASE_URL=mysql://torrust:password@mysql:3306/torrust_tracker
+
 # Service Configuration
 GRAFANA_ADMIN_PASSWORD=admin
+GF_SECURITY_ADMIN_USER=admin
+GF_SECURITY_ADMIN_PASSWORD=admin
 PROMETHEUS_RETENTION_TIME=7d
 
 # Docker Configuration

infrastructure/config/environments/production.env

@@ -39,8 +39,18 @@ TORRUST_TRACKER_HEALTH_CHECK_PORT=1313
 # API Authentication (from secrets)
 TORRUST_TRACKER_API_TOKEN=${TORRUST_PROD_API_TOKEN}
 
+# Database Configuration for Docker Compose
+MYSQL_ROOT_PASSWORD=${MYSQL_PROD_ROOT_PASSWORD}
+MYSQL_DATABASE=torrust_tracker
+MYSQL_USER=torrust
+MYSQL_PASSWORD=${MYSQL_PROD_PASSWORD}
+TORRUST_TRACKER_DATABASE=mysql
+TORRUST_TRACKER_DATABASE_URL=${TORRUST_PROD_DATABASE_URL}
+
 # Service Configuration
 GRAFANA_ADMIN_PASSWORD=${GRAFANA_PROD_PASSWORD}
+GF_SECURITY_ADMIN_USER=admin
+GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PROD_PASSWORD}
 PROMETHEUS_RETENTION_TIME=30d
 
 # Security Configuration

infrastructure/config/templates/docker-compose.env.tpl

@@ -0,0 +1,17 @@
+# Generated Docker Compose environment file for ${ENVIRONMENT}
+# Generated on: ${GENERATION_DATE}
+
+# Database Configuration
+MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+MYSQL_DATABASE=${MYSQL_DATABASE}
+MYSQL_USER=${MYSQL_USER}
+MYSQL_PASSWORD=${MYSQL_PASSWORD}
+
+# Tracker Configuration
+USER_ID=${USER_ID}
+TORRUST_TRACKER_DATABASE=${TORRUST_TRACKER_DATABASE}
+TORRUST_TRACKER_DATABASE_URL=${TORRUST_TRACKER_DATABASE_URL}
+
+# Grafana Configuration
+GF_SECURITY_ADMIN_USER=${GF_SECURITY_ADMIN_USER}
+GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD}

infrastructure/scripts/configure-env.sh

@@ -104,13 +104,38 @@ process_templates() {
     log_success "Configuration templates processed"
 }
 
+# Generate .env file for Docker Compose
+generate_docker_env() {
+    local templates_dir="${CONFIG_DIR}/templates"
+    local env_output="${PROJECT_ROOT}/application/.env"
+
+    log_info "Generating Docker Compose environment file"
+
+    # Set generation date for template
+    GENERATION_DATE="$(date)"
+    export GENERATION_DATE
+
+    # Ensure ENVIRONMENT is exported for template substitution
+    export ENVIRONMENT
+
+    # Process Docker Compose environment template
+    if [[ -f "${templates_dir}/docker-compose.env.tpl" ]]; then
+        envsubst <"${templates_dir}/docker-compose.env.tpl" >"${env_output}"
+        log_info "Generated: ${env_output}"
+    else
+        log_error "Docker Compose environment template not found: ${templates_dir}/docker-compose.env.tpl"
+        exit 1
+    fi
+}
+
 # Main execution
 main() {
     log_info "Starting configuration processing for environment: ${ENVIRONMENT}"
 
     load_environment
     validate_environment
     process_templates
+    generate_docker_env
 
     log_success "Configuration processing completed successfully"
 }

infrastructure/scripts/validate-config.sh

@@ -124,21 +124,43 @@ validate_yaml_files() {
 
     log_info "Validating YAML configuration files..."
 
-    # YAML syntax validation
-    if command -v yamllint >/dev/null 2>&1; then
-        if yamllint "${prometheus_config}"; then
-            log_success "YAML syntax validation passed (using yamllint)"
+    # Check if file is in ignored directory
+    if [[ "${prometheus_config}" == *"application/storage/"* ]]; then
+        log_info "Skipping yamllint for file in ignored directory: application/storage/"
+        # Basic YAML validation using Python instead
+        if python3 -c "import yaml; yaml.safe_load(open('${prometheus_config}'))" 2>/dev/null; then
+            log_success "Basic YAML syntax validation passed (file in ignored directory)"
         else
-            log_error "YAML syntax validation failed"
+            log_error "Basic YAML syntax validation failed"
             return 1
         fi
     else
-        # Basic YAML validation using Python
-        if python3 -c "import yaml; yaml.safe_load(open('${prometheus_config}'))" 2>/dev/null; then
-            log_success "Basic YAML syntax validation passed"
+        # YAML syntax validation for files not in ignored directories
+        if command -v yamllint >/dev/null 2>&1; then
+            # Use project yamllint config if it exists
+            if [[ -f "${PROJECT_ROOT}/.yamllint-ci.yml" ]]; then
+                if yamllint -c "${PROJECT_ROOT}/.yamllint-ci.yml" "${prometheus_config}"; then
+                    log_success "YAML syntax validation passed (using yamllint with project config)"
+                else
+                    log_error "YAML syntax validation failed"
+                    return 1
+                fi
+            else
+                if yamllint "${prometheus_config}"; then
+                    log_success "YAML syntax validation passed (using yamllint)"
+                else
+                    log_error "YAML syntax validation failed"
+                    return 1
+                fi
+            fi
         else
-            log_error "Basic YAML syntax validation failed"
-            return 1
+            # Basic YAML validation using Python
+            if python3 -c "import yaml; yaml.safe_load(open('${prometheus_config}'))" 2>/dev/null; then
+                log_success "Basic YAML syntax validation passed"
+            else
+                log_error "Basic YAML syntax validation failed"
+                return 1
+            fi
         fi
     fi
 
@@ -243,7 +265,7 @@ validate_template_substitution() {
     for file in "${files_to_check[@]}"; do
         if [[ -f "${file}" ]]; then
             # Check for unsubstituted variables (${VAR} patterns)
-            if grep -n '\$\{[^}]*\}' "${file}"; then
+            if grep -n '\$[{][^}]*[}]' "${file}"; then
                 log_error "Unsubstituted template variables found in: ${file}"
                 found_issues=true
             fi