diff --git a/group_vars/docker/services.yml b/group_vars/docker/services.yml index b12c32e..c4ea4e0 100644 --- a/group_vars/docker/services.yml +++ b/group_vars/docker/services.yml @@ -21,7 +21,7 @@ services: db_user: "dawarich" # StarPunk image tag, built by CI in the StarPunk repo (bump to deploy a release) -starpunk_version: "v2.14.2" +starpunk_version: "v2.15.0" # StarPunk admin: Pocket ID user ID (sub) of phil starpunk_admin_sub: "5754855f-0a30-4755-9609-7294209e40f4" diff --git a/roles/docker/templates/Caddyfile.j2 b/roles/docker/templates/Caddyfile.j2 index 082e0be..532a368 100644 --- a/roles/docker/templates/Caddyfile.j2 +++ b/roles/docker/templates/Caddyfile.j2 @@ -116,8 +116,15 @@ pdg.thesatelliteoflove.com { starpunk.thesatelliteoflove.com { import hsts - reverse_proxy starpunk:8000 - } + # MCP endpoint and its OAuth protected resource metadata (StarPunk v2.15.0) + @mcp path /mcp /mcp/* /.well-known/oauth-protected-resource /.well-known/oauth-protected-resource/* + handle @mcp { + reverse_proxy starpunk-mcp:8001 + } + handle { + reverse_proxy starpunk:8000 + } +} repair.nerder.land { import hsts diff --git a/roles/docker/templates/starpunk-compose.yml.j2 b/roles/docker/templates/starpunk-compose.yml.j2 index cfc02a1..76e82e0 100644 --- a/roles/docker/templates/starpunk-compose.yml.j2 +++ b/roles/docker/templates/starpunk-compose.yml.j2 @@ -11,7 +11,7 @@ services: - '{{ subdomains.gotify }}:{{ docker.hairpin_ip }}' volumes: - starpunk-data:/data - environment: + environment: &starpunk-env # Site configuration SITE_URL: https://{{ subdomains.starpunk }} SITE_NAME: StarPunk @@ -55,6 +55,34 @@ services: FLASK_DEBUG: 0 LOG_LEVEL: INFO DEV_MODE: false + + # MCP server for AI clients (StarPunk v2.15.0, ADR-075): same image, data + # and settings; Caddy sends /mcp and its OAuth metadata here. Tokens come + # from StarPunk's own IndieAuth server (approve at /auth/authorize). + starpunk-mcp: + image: {{ subdomains.git }}/phil/starpunk:{{ starpunk_version }} + container_name: starpunk-mcp + restart: unless-stopped + command: ["uvicorn", "starpunk.mcp_server.app:app", "--host", "0.0.0.0", "--port", "8001"] + # The image's healthcheck probes the Flask app on :8000 + healthcheck: + test: ["CMD", "python3", "-c", "import socket; socket.create_connection(('localhost', 8001), 2)"] + interval: 30s + timeout: 5s + retries: 3 + depends_on: + - starpunk + extra_hosts: + - '{{ subdomains.pocketid }}:{{ docker.hairpin_ip }}' + - '{{ primary_domain }}:{{ docker.hairpin_ip }}' + - '{{ subdomains.social }}:{{ docker.hairpin_ip }}' + - '{{ subdomains.gotify }}:{{ docker.hairpin_ip }}' + volumes: + - starpunk-data:/data + environment: + <<: *starpunk-env + # Only the main container runs the webmention, WebSub and syndication workers + BACKGROUND_WORKERS_ENABLED: "false" volumes: # Existing volume (starpunk_starpunk-data) holds the posts and database starpunk-data: