From c307777a6db9f2336882a7034452d3d88d748add Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Sun, 22 Oct 2023 00:28:27 -0600 Subject: [PATCH] feat: update .env.example and add Caddyfile --- .env.example | 8 ++++-- Caddyfile.localhost | 64 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 Caddyfile.localhost diff --git a/.env.example b/.env.example index 601c5844f..9ca556252 100644 --- a/.env.example +++ b/.env.example @@ -1,2 +1,6 @@ -OLLAMA_API_ENDPOINT="" -PUBLIC_API_ENDPOINT="$OLLAMA_API_ENDPOINT" \ No newline at end of file +PUBLIC_API_ENDPOINT="http://localhost:11434/api" + +OLLAMA_API_ID='my-api-token' +OLLAMA_API_TOKEN='xxxxxxxxxxxxxxxx' +# generated by passing the token to `caddy hash-password` +OLLAMA_API_TOKEN_DIGEST='$2a$14$iyyuawykR92xTHNR9lWzfu.uCct/9/xUPX3zBqLqrjAu0usNRPbyi' diff --git a/Caddyfile.localhost b/Caddyfile.localhost new file mode 100644 index 000000000..80728eedf --- /dev/null +++ b/Caddyfile.localhost @@ -0,0 +1,64 @@ +# Run with +# caddy run --envfile ./example.env --config ./Caddyfile.localhost +# +# This is configured for +# - Automatic HTTPS (even for localhost) +# - Reverse Proxying to Ollama API Base URL (http://localhost:11434/api) +# - CORS +# - HTTP Basic Auth API Tokens (uncomment basicauth section) + + +# CORS Preflight (OPTIONS) + Request (GET, POST, PATCH, PUT, DELETE) +(cors-api) { + @match-cors-api-preflight method OPTIONS + handle @match-cors-api-preflight { + header { + Access-Control-Allow-Origin "{http.request.header.origin}" + Access-Control-Allow-Methods "GET, POST, PUT, PATCH, DELETE, OPTIONS" + Access-Control-Allow-Headers "Origin, Accept, Authorization, Content-Type, X-Requested-With" + Access-Control-Allow-Credentials "true" + Access-Control-Max-Age "3600" + defer + } + respond "" 204 + } + + @match-cors-api-request { + not { + header Origin "{http.request.scheme}://{http.request.host}" + } + header Origin "{http.request.header.origin}" + } + handle @match-cors-api-request { + header { + Access-Control-Allow-Origin "{http.request.header.origin}" + Access-Control-Allow-Methods "GET, POST, PUT, PATCH, DELETE, OPTIONS" + Access-Control-Allow-Headers "Origin, Accept, Authorization, Content-Type, X-Requested-With" + Access-Control-Allow-Credentials "true" + Access-Control-Max-Age "3600" + defer + } + } +} + +# replace localhost with example.com or whatever +localhost { + ## HTTP Basic Auth + ## (uncomment to enable) + # basicauth { + # # see .example.env for how to generate tokens + # {env.OLLAMA_API_ID} {env.OLLAMA_API_TOKEN_DIGEST} + # } + + handle /api/* { + # Comment to disable CORS + import cors-api + + reverse_proxy localhost:11434 + } + + # Same-Origin Static Web Server + file_server { + root ./build/ + } +}