From b076978baecd39cfd37f259a266366680601545a Mon Sep 17 00:00:00 2001 From: ryo Date: Mon, 13 Oct 2025 21:28:03 -0700 Subject: [PATCH 1/2] draft update to separate the /Users/ryo for mac --- .env.example | 5 +++++ docker-compose.yml | 24 ++++++++++++------------ registry/core/nginx_service.py | 8 +++++++- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.env.example b/.env.example index 5722169..ba6e217 100644 --- a/.env.example +++ b/.env.example @@ -4,6 +4,11 @@ # Copy this file to .env and update with your actual values # Never commit real credentials to version control +# ============================================================================= +# DOCKER CONFIGURATION +# ============================================================================= +APP_HOME=/opt + # ============================================================================= # REGISTRY CONFIGURATION # ============================================================================= diff --git a/docker-compose.yml b/docker-compose.yml index 5a50726..3569171 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,11 +39,11 @@ services: - "443:443" - "7860:7860" volumes: - - ${HOME}/mcp-gateway/servers:/app/registry/servers - - ${HOME}/mcp-gateway/models:/app/registry/models - - ${HOME}/mcp-gateway/logs:/app/logs - - ${HOME}/mcp-gateway/auth_server/scopes.yml:/app/auth_server/scopes.yml - - ${HOME}/mcp-gateway/ssl:/etc/ssl:ro + - ${APP_HOME}/mcp-gateway/servers:/app/registry/servers + - ${APP_HOME}/mcp-gateway/models:/app/registry/models + - ${APP_HOME}/mcp-gateway/logs:/app/logs + - ${APP_HOME}/mcp-gateway/auth_server/scopes.yml:/app/auth_server/scopes.yml + - ${APP_HOME}/mcp-gateway/ssl:/etc/ssl:ro depends_on: - auth-server - metrics-service @@ -71,7 +71,7 @@ services: - "9465:9465" # Prometheus metrics endpoint volumes: - metrics-db-data:/var/lib/sqlite - - ${HOME}/mcp-gateway/logs:/app/logs + - ${APP_HOME}/mcp-gateway/logs:/app/logs depends_on: - metrics-db restart: unless-stopped @@ -116,8 +116,8 @@ services: ports: - "8888:8888" volumes: - - ${HOME}/mcp-gateway/logs:/app/logs - - ${HOME}/mcp-gateway/auth_server/scopes.yml:/app/scopes.yml + - ${APP_HOME}/mcp-gateway/logs:/app/logs + - ${APP_HOME}/mcp-gateway/auth_server/scopes.yml:/app/scopes.yml restart: unless-stopped # Current Time MCP Server @@ -145,7 +145,7 @@ services: - PORT=8001 - SECRET_KEY=${SECRET_KEY} volumes: - - ${HOME}/mcp-gateway/secrets/fininfo/:/app/fininfo/ + - ${APP_HOME}/mcp-gateway/secrets/fininfo/:/app/fininfo/ ports: - "8001:8001" restart: unless-stopped @@ -163,9 +163,9 @@ services: - REGISTRY_USERNAME=${ADMIN_USER:-admin} - REGISTRY_PASSWORD=${ADMIN_PASSWORD} volumes: - - ${HOME}/mcp-gateway/servers:/app/registry/servers - - ${HOME}/mcp-gateway/models:/app/registry/models - - ${HOME}/mcp-gateway/auth_server/scopes.yml:/app/auth_server/scopes.yml + - ${APP_HOME}/mcp-gateway/servers:/app/registry/servers + - ${APP_HOME}/mcp-gateway/models:/app/registry/models + - ${APP_HOME}/mcp-gateway/auth_server/scopes.yml:/app/auth_server/scopes.yml ports: - "8003:8003" depends_on: diff --git a/registry/core/nginx_service.py b/registry/core/nginx_service.py index 4aabb32..a25a9c0 100644 --- a/registry/core/nginx_service.py +++ b/registry/core/nginx_service.py @@ -150,7 +150,13 @@ async def generate_config_async(self, servers: Dict[str, Dict[str, Any]]) -> boo # Replace placeholders in template config_content = template_content.replace("{{LOCATION_BLOCKS}}", "\n".join(location_blocks)) - config_content = config_content.replace("{{EC2_PUBLIC_DNS}}", ec2_public_dns) + # Only include EC2_PUBLIC_DNS in server_name if it exists + if ec2_public_dns: + config_content = config_content.replace("{{EC2_PUBLIC_DNS}}", ec2_public_dns) + else: + # Remove the placeholder entirely if EC2_PUBLIC_DNS is empty + config_content = config_content.replace(" {{EC2_PUBLIC_DNS}}", "") + config_content = config_content.replace("{{EC2_PUBLIC_DNS}}", "") # Write config file with open(settings.nginx_config_path, "w") as f: From 3374462acfecbf24407ee63917bd495c38cbb121 Mon Sep 17 00:00:00 2001 From: ryo Date: Thu, 16 Oct 2025 08:40:37 -0700 Subject: [PATCH 2/2] update as per owner's comment --- .env.example | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.env.example b/.env.example index ba6e217..aa890a7 100644 --- a/.env.example +++ b/.env.example @@ -7,7 +7,9 @@ # ============================================================================= # DOCKER CONFIGURATION # ============================================================================= +#different options for the home directory e.g. Ubuntu set to /home/ubuntu, set to /opt for mac would require sudo during installation APP_HOME=/opt +# APP_HOME=/home/ubuntu # ============================================================================= # REGISTRY CONFIGURATION