feat(deploy): caddy with https support (#160)

* refactor(deploy): nginx -> caddy

* refactor(deploy): list endpoints from modos-server instead of nginx

* doc(deploy): show example domain value

* fix(deploy): fallback value for DOMAIN

* fix(deploy): wilcard paths in caddy

* chore: update env example

* fix(server): htsget env var

Co-authored-by: almutlue <[email protected]>

* fix(deploy): drop NET_ADMIN cap from caddy

---------

Co-authored-by: almutlue <[email protected]>

Author: cmdoret

tools/deploy/.example.env

@@ -13,8 +13,8 @@ S3_ADDRESSING_STYLE="auto" # one of auto, path, virtual
 HTSGET_DATA_DIR="/data"
 
 # PUBLIC
-# URL_PREFIX="https://modos.example.org"
-# S3_PUBLIC_URL="${URL_PREFIX}/s3"
-# FUZON_PUBLIC_URL="${URL_PREFIX}/fuzon"
-# HTSGET_PUBLIC_URL="${URL_PREFIX}/htsget"
-# REFGET_PUBLIC_URL="${URL_PREFIX}/refget"
+#DOMAIN="http://localhost"
+#S3_PUBLIC_URL="${DOMAIN}:9000"
+#FUZON_PUBLIC_URL="${DOMAIN}/fuzon"
+#HTSGET_PUBLIC_URL="${DOMAIN}/htsget"
+#REFGET_PUBLIC_URL="${DOMAIN}/refget"

tools/deploy/caddy/Caddyfile

@@ -0,0 +1,38 @@
+{
+    admin off
+    default_bind 0.0.0.0
+    http_port 80
+}
+
+http:// {
+
+  encode
+  request_body {
+      max_size 5TB
+  }
+
+  # object storage service
+  handle_path /s3/* {
+      reverse_proxy {$S3_LOCAL_URL}
+  }
+
+  # genomics streaming service
+  handle_path /htsget/* {
+      reverse_proxy {$HTSGET_LOCAL_URL}
+  }
+
+  # terminology code matching service
+  handle_path /fuzon/* {
+      reverse_proxy {$FUZON_LOCAL_URL}
+  }
+
+  # reference sequence server
+  handle_path /refget/* {
+    reverse_proxy {$REFGET_LOCAL_URL}
+
+  }
+
+  handle /* {
+      reverse_proxy {$MODOS_LOCAL_URL}
+  }
+}

tools/deploy/compose.yaml

@@ -1,4 +1,6 @@
 volumes:
+  caddy-data:
+  caddy-config:
   minio-data:
     driver: local
 
@@ -8,24 +10,27 @@ networks:
 
 services:
 
-  nginx:
-    image: nginx:1.23
+  caddy:
+    image: docker.io/caddy:2
+    restart: always
     depends_on:
       - htsget
+    ports:
+      - "80:80"
+      - "80:80/udp"
+      - "443:443"
+      - "443:443/udp"
     volumes:
-      - ./nginx/default.conf.template:/etc/nginx/templates/default.conf.template:ro
+      - ./caddy/Caddyfile:/etc/caddy/Caddyfile
+      - caddy-data:/data
+      - caddy-config:/config
     environment:
-      - REFGET_PUBLIC_URL=${REFGET_PUBLIC_URL:-http://localhost/refget}
-      - FUZON_PUBLIC_URL=${FUZON_PUBLIC_URL:-http://localhost/fuzon}
-      - HTSGET_PUBLIC_URL=${HTSGET_PUBLIC_URL:-http://localhost/htsget}
-      - S3_PUBLIC_URL=${S3_PUBLIC_URL:-http://localhost/s3}
+      - DOMAIN=${DOMAIN:-http://localhost}
       - FUZON_LOCAL_URL=${FUZON_LOCAL_URL:-http://fuzon:9090}
       - REFGET_LOCAL_URL=${REFGET_LOCAL_URL:-http://refget:8080}
       - HTSGET_LOCAL_URL=${HTSGET_LOCAL_URL:-http://htsget:8080}
       - MODOS_LOCAL_URL=${MODOS_LOCAL_URL:-http://modos-server:8000}
       - S3_LOCAL_URL=${S3_LOCAL_URL:-http://minio:9000}
-    ports:
-      - "80:80"
     networks:
       - modos-network
 
@@ -93,16 +98,20 @@ services:
       - ENDPOINT=${S3_PUBLIC_URL:-http://localhost/s3}
       - BUCKET=${REFERENCE_BUCKET:-reference-genomes}
 
+
   modos-server:
     build: ./modos-server
     expose:
       - "8000"
     networks:
       - modos-network
     environment:
-      - S3_LOCAL_URL=${S3_LOCAL_URL:-http://minio:9000}
-      - S3_PUBLIC_URL=${S3_PUBLIC_URL:-http://localhost/s3}
+      - FUZON_PUBLIC_URL=${FUZON_PUBLIC_URL:-http://localhost/fuzon}
       - HTSGET_LOCAL_URL=${HTSGET_LOCAL_URL:-http://htsget:8080}
-      - S3_BUCKET=${S3_BUCKET:-modos-demo}
+      - HTSGET_PUBLIC_URL=${HTSGET_PUBLIC_URL:-http://localhost/htsget}
+      - REFGET_PUBLIC_URL=${REFGET_PUBLIC_URL:-http://localhost/refget}
       - S3_ADDRESSING_STYLE=${S3_ADDRESSING_STYLE:-auto}
+      - S3_BUCKET=${S3_BUCKET:-modos-demo}
+      - S3_LOCAL_URL=${S3_LOCAL_URL:-http://minio:9000}
+      - S3_PUBLIC_URL=${S3_PUBLIC_URL:-http://localhost/s3}
     command: uv run uvicorn --host 0.0.0.0 --port 8000 --reload server:app

tools/deploy/modos-server/server.py

@@ -15,11 +15,13 @@
 from modos.logging import setup_logging
 from modos.storage import connect_s3
 
-
+FUZON_PUBLIC_URL = os.environ["FUZON_PUBLIC_URL"]
 S3_LOCAL_URL = os.environ["S3_LOCAL_URL"]
 S3_PUBLIC_URL = os.environ["S3_PUBLIC_URL"]
 BUCKET = os.environ["S3_BUCKET"]
 HTSGET_LOCAL_URL = os.environ["HTSGET_LOCAL_URL"]
+HTSGET_PUBLIC_URL = os.environ["HTSGET_PUBLIC_URL"]
+REFGET_PUBLIC_URL = os.environ["REFGET_PUBLIC_URL"]
 SERVICES = {
     "s3": S3_LOCAL_URL,
     "htsget": HTSGET_LOCAL_URL,
@@ -80,3 +82,14 @@ def get_s3_path(query: str, exact_match: bool = False):
         }
         for modo in res
     ]
+
+
+@app.get("/")
+def get_endpoints():
+    return {
+        "status": "success",
+        "s3": S3_PUBLIC_URL,
+        "htsget": HTSGET_PUBLIC_URL,
+        "fuzon": FUZON_PUBLIC_URL,
+        "refget": REFGET_PUBLIC_URL,
+    }