From 9ba99a33b496ea36ee0f0dac5f733761cee49cd1 Mon Sep 17 00:00:00 2001 From: Yury Kossakovsky Date: Tue, 27 May 2025 15:58:07 -0600 Subject: [PATCH] Update Neo4j username handling in configuration files - Set default Neo4j username in .env.example for easier configuration. - Removed dynamic assignment of Neo4j username in 03_generate_secrets.sh to streamline secret generation. - Updated user input variable list to reflect the changes in Neo4j username handling. --- .env.example | 2 +- scripts/03_generate_secrets.sh | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.env.example b/.env.example index f416871..c7a5bdf 100644 --- a/.env.example +++ b/.env.example @@ -82,7 +82,7 @@ WEAVIATE_API_KEY= # Neo4j username and password ############ -NEO4J_AUTH_USERNAME= +NEO4J_AUTH_USERNAME=neo4j NEO4J_AUTH_PASSWORD= diff --git a/scripts/03_generate_secrets.sh b/scripts/03_generate_secrets.sh index cbe1ef3..79616e0 100755 --- a/scripts/03_generate_secrets.sh +++ b/scripts/03_generate_secrets.sh @@ -333,7 +333,6 @@ generated_values["LANGFUSE_INIT_USER_EMAIL"]="$USER_EMAIL" generated_values["N8N_WORKER_COUNT"]="$N8N_WORKER_COUNT" generated_values["N8N_WORKFLOWS_IMPORTED_EVER"]="$N8N_WORKFLOWS_IMPORTED_EVER_VALUE" generated_values["WEAVIATE_USERNAME"]="$USER_EMAIL" # Set Weaviate username for Caddy -generated_values["NEO4J_AUTH_USERNAME"]="$USER_EMAIL" # Set Neo4j username if [[ -n "$OPENAI_API_KEY" ]]; then generated_values["OPENAI_API_KEY"]="$OPENAI_API_KEY" fi @@ -356,7 +355,7 @@ found_vars["LANGFUSE_INIT_USER_EMAIL"]=0 found_vars["N8N_WORKER_COUNT"]=0 found_vars["N8N_WORKFLOWS_IMPORTED_EVER"]=0 found_vars["WEAVIATE_USERNAME"]=0 -found_vars["NEO4J_AUTH_USERNAME"]=0 +found_vars["vEO4J_AUTH_USERNAME"]=0 # Read template, substitute domain, generate initial values while IFS= read -r line || [[ -n "$line" ]]; do @@ -402,7 +401,7 @@ while IFS= read -r line || [[ -n "$line" ]]; do # This 'else' block is for lines from template not covered by existing values or VARS_TO_GENERATE. # Check if it is one of the user input vars - these are handled by found_vars later if not in template. is_user_input_var=0 # Reset for each line - user_input_vars=("FLOWISE_USERNAME" "DASHBOARD_USERNAME" "LETSENCRYPT_EMAIL" "RUN_N8N_IMPORT" "PROMETHEUS_USERNAME" "SEARXNG_USERNAME" "OPENAI_API_KEY" "LANGFUSE_INIT_USER_EMAIL" "N8N_WORKER_COUNT" "N8N_WORKFLOWS_IMPORTED_EVER" "WEAVIATE_USERNAME" "NEO4J_AUTH_USERNAME") + user_input_vars=("FLOWISE_USERNAME" "DASHBOARD_USERNAME" "LETSENCRYPT_EMAIL" "RUN_N8N_IMPORT" "PROMETHEUS_USERNAME" "SEARXNG_USERNAME" "OPENAI_API_KEY" "LANGFUSE_INIT_USER_EMAIL" "N8N_WORKER_COUNT" "N8N_WORKFLOWS_IMPORTED_EVER" "WEAVIATE_USERNAME") for uivar in "${user_input_vars[@]}"; do if [[ "$varName" == "$uivar" ]]; then is_user_input_var=1 @@ -490,7 +489,7 @@ else fi # Add any custom variables that weren't found in the template -for var in "FLOWISE_USERNAME" "DASHBOARD_USERNAME" "LETSENCRYPT_EMAIL" "RUN_N8N_IMPORT" "OPENAI_API_KEY" "PROMETHEUS_USERNAME" "SEARXNG_USERNAME" "LANGFUSE_INIT_USER_EMAIL" "N8N_WORKER_COUNT" "N8N_WORKFLOWS_IMPORTED_EVER" "WEAVIATE_USERNAME" "NEO4J_AUTH_USERNAME"; do +for var in "FLOWISE_USERNAME" "DASHBOARD_USERNAME" "LETSENCRYPT_EMAIL" "RUN_N8N_IMPORT" "OPENAI_API_KEY" "PROMETHEUS_USERNAME" "SEARXNG_USERNAME" "LANGFUSE_INIT_USER_EMAIL" "N8N_WORKER_COUNT" "N8N_WORKFLOWS_IMPORTED_EVER" "WEAVIATE_USERNAME"; do if [[ ${found_vars["$var"]} -eq 0 && -v generated_values["$var"] ]]; then # Before appending, check if it's already in TMP_ENV_FILE to avoid duplicates if ! grep -q -E "^${var}=" "$TMP_ENV_FILE"; then