diff --git a/.env.example b/.env.example index 623e8d4..c8801f4 100644 --- a/.env.example +++ b/.env.example @@ -73,7 +73,6 @@ POOLER_TENANT_ID=1000 ############ WEAVIATE_USERNAME= -WEAVIATE_PASSWORD= WEAVIATE_API_KEY= @@ -269,5 +268,4 @@ LETTA_SERVER_PASSWORD= ########################################################################################### COMPOSE_PROFILES="n8n" PROMETHEUS_PASSWORD_HASH= -SEARXNG_PASSWORD_HASH= -WEAVIATE_PASSWORD_HASH= \ No newline at end of file +SEARXNG_PASSWORD_HASH= \ No newline at end of file diff --git a/Caddyfile b/Caddyfile index f7e2942..b73571c 100644 --- a/Caddyfile +++ b/Caddyfile @@ -50,9 +50,6 @@ # Weaviate {$WEAVIATE_HOSTNAME} { - basic_auth { - {$WEAVIATE_USERNAME} {$WEAVIATE_PASSWORD_HASH} - } reverse_proxy weaviate:8080 } diff --git a/docker-compose.yml b/docker-compose.yml index 93723ab..d22802a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -194,7 +194,6 @@ services: - LANGFUSE_HOSTNAME=${LANGFUSE_HOSTNAME} - WEAVIATE_HOSTNAME=${WEAVIATE_HOSTNAME} - WEAVIATE_USERNAME=${WEAVIATE_USERNAME} - - WEAVIATE_PASSWORD_HASH=${WEAVIATE_PASSWORD_HASH} - 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 dcc5043..ff3bd8c 100755 --- a/scripts/03_generate_secrets.sh +++ b/scripts/03_generate_secrets.sh @@ -45,7 +45,6 @@ declare -A VARS_TO_GENERATE=( ["LANGFUSE_INIT_USER_PASSWORD"]="password:32" ["LANGFUSE_INIT_PROJECT_PUBLIC_KEY"]="langfuse_pk:32" ["LANGFUSE_INIT_PROJECT_SECRET_KEY"]="langfuse_sk:32" - ["WEAVIATE_PASSWORD"]="password:32" # Password for Caddy basic auth ["WEAVIATE_API_KEY"]="secret:48" # API Key for Weaviate service (36 bytes -> 48 chars base64) ["NEO4J_AUTH_PASSWORD"]="password:32" # Added Neo4j password ["NEO4J_AUTH_USERNAME"]="fixed:neo4j" # Added Neo4j username @@ -625,7 +624,6 @@ done # Hash passwords using caddy with bcrypt PROMETHEUS_PLAIN_PASS="${generated_values["PROMETHEUS_PASSWORD"]}" SEARXNG_PLAIN_PASS="${generated_values["SEARXNG_PASSWORD"]}" -WEAVIATE_PLAIN_PASS="${generated_values["WEAVIATE_PASSWORD"]}" # --- PROMETHEUS --- # Try to get existing hash from memory (populated from .env if it was there) @@ -654,18 +652,6 @@ if [[ -z "$FINAL_SEARXNG_HASH" && -n "$SEARXNG_PLAIN_PASS" ]]; then fi _update_or_add_env_var "SEARXNG_PASSWORD_HASH" "$FINAL_SEARXNG_HASH" -# --- WEAVIATE --- -FINAL_WEAVIATE_HASH="${generated_values[WEAVIATE_PASSWORD_HASH]}" - -if [[ -z "$FINAL_WEAVIATE_HASH" && -n "$WEAVIATE_PLAIN_PASS" ]]; then - NEW_HASH=$(_generate_and_get_hash "$WEAVIATE_PLAIN_PASS") - if [[ -n "$NEW_HASH" ]]; then - FINAL_WEAVIATE_HASH="$NEW_HASH" - generated_values["WEAVIATE_PASSWORD_HASH"]="$NEW_HASH" - fi -fi -_update_or_add_env_var "WEAVIATE_PASSWORD_HASH" "$FINAL_WEAVIATE_HASH" - if [ $? -eq 0 ]; then # This $? reflects the status of the last mv command from the last _update_or_add_env_var call. # For now, assuming if we reached here and mv was fine, primary operations were okay. diff --git a/scripts/06_final_report.sh b/scripts/06_final_report.sh index cfc9ab6..1c5895f 100755 --- a/scripts/06_final_report.sh +++ b/scripts/06_final_report.sh @@ -161,8 +161,7 @@ if is_profile_active "weaviate"; then echo "================================= Weaviate ============================" echo echo "Host: ${WEAVIATE_HOSTNAME:-}" - echo "User: ${WEAVIATE_USERNAME:-}" - echo "Password: ${WEAVIATE_PASSWORD:-}" + echo "Admin User (for Weaviate RBAC): ${WEAVIATE_USERNAME:-}" echo "Weaviate API Key: ${WEAVIATE_API_KEY:-}" fi