From ba630366304062a0ad40aa895042c4e6fbc64959 Mon Sep 17 00:00:00 2001 From: Yury Kossakovsky Date: Tue, 17 Jun 2025 14:28:23 -0600 Subject: [PATCH] Add Qdrant configuration to environment and Caddyfile - Introduced QDRANT_API_KEY and QDRANT_HOSTNAME to .env.example for required configuration. - Updated Caddyfile to include reverse proxy settings for Qdrant service. - Modified docker-compose.yml to set QDRANT__SERVICE__API_KEY environment variable and adjusted service hostname. - Enhanced secret generation script to include QDRANT_API_KEY for better integration. --- .env.example | 9 ++++++++- Caddyfile | 5 +++++ docker-compose.yml | 4 +++- scripts/03_generate_secrets.sh | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index 3dc25e5..e21f429 100644 --- a/.env.example +++ b/.env.example @@ -76,6 +76,13 @@ WEAVIATE_USERNAME= WEAVIATE_API_KEY= +############ +# [required] +# Qdrant API Key +############ +QDRANT_API_KEY= + + ############ # [required] # Neo4j username and password @@ -128,9 +135,9 @@ NEO4J_HOSTNAME=neo4j.yourdomain.com GRAFANA_HOSTNAME=grafana.yourdomain.com PROMETHEUS_HOSTNAME=prometheus.yourdomain.com LETTA_HOSTNAME=letta.yourdomain.com +QDRANT_HOSTNAME=qdrant.yourdomain.com LETSENCRYPT_EMAIL= - # Everything below this point is optional. # Default values will suffice unless you need more features/customization. diff --git a/Caddyfile b/Caddyfile index b73571c..b4ef6c2 100644 --- a/Caddyfile +++ b/Caddyfile @@ -53,6 +53,11 @@ reverse_proxy weaviate:8080 } +# Qdrant +{$QDRANT_HOSTNAME} { + reverse_proxy qdrant:6333 +} + # Neo4j {$NEO4J_HOSTNAME} { reverse_proxy neo4j:7474 diff --git a/docker-compose.yml b/docker-compose.yml index d22802a..47d21bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -144,6 +144,8 @@ services: restart: unless-stopped volumes: - qdrant_storage:/qdrant/storage + environment: + - QDRANT__SERVICE__API_KEY=${QDRANT_API_KEY} expose: - "6333" @@ -193,7 +195,7 @@ services: - SEARXNG_HOSTNAME=${SEARXNG_HOSTNAME} - LANGFUSE_HOSTNAME=${LANGFUSE_HOSTNAME} - WEAVIATE_HOSTNAME=${WEAVIATE_HOSTNAME} - - WEAVIATE_USERNAME=${WEAVIATE_USERNAME} + - QDRANT_HOSTNAME=${QDRANT_HOSTNAME} - NEO4J_HOSTNAME=${NEO4J_HOSTNAME} - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL:-internal} - PROMETHEUS_HOSTNAME=${PROMETHEUS_HOSTNAME} diff --git a/scripts/03_generate_secrets.sh b/scripts/03_generate_secrets.sh index 6becc68..31a87ef 100755 --- a/scripts/03_generate_secrets.sh +++ b/scripts/03_generate_secrets.sh @@ -48,6 +48,7 @@ declare -A VARS_TO_GENERATE=( ["LANGFUSE_INIT_PROJECT_PUBLIC_KEY"]="langfuse_pk:32" ["LANGFUSE_INIT_PROJECT_SECRET_KEY"]="langfuse_sk:32" ["WEAVIATE_API_KEY"]="secret:48" # API Key for Weaviate service (36 bytes -> 48 chars base64) + ["QDRANT_API_KEY"]="secret:48" # API Key for Qdrant service ["NEO4J_AUTH_PASSWORD"]="password:32" # Added Neo4j password ["NEO4J_AUTH_USERNAME"]="fixed:neo4j" # Added Neo4j username )