diff --git a/logclient/scripts/generate-config.sh b/logclient/scripts/generate-config.sh index 4e4f67b..92590d6 100755 --- a/logclient/scripts/generate-config.sh +++ b/logclient/scripts/generate-config.sh @@ -16,7 +16,7 @@ fi mkdir -p "$CONFIG_DIR" # Generate filebeat.yml configuration -cat > "$CONFIG_DIR/filebeat.yml" << 'EOF' +cat > "$CONFIG_DIR/filebeat.yml" << EOF # Filebeat Configuration for LogClient # Generated by generate-config.sh @@ -71,7 +71,7 @@ output.logstash: # Performance settings bulk_max_size: ${BULK_MAX_SIZE:-2048} - worker: ${WORKER_THREADS:-1} + worker: ${WORKER_THREADS:-1} # Must be >= 1 compression_level: 3 # Retry configuration diff --git a/logserver/install.sh b/logserver/install.sh index cd27875..e233ed2 100755 --- a/logserver/install.sh +++ b/logserver/install.sh @@ -159,10 +159,17 @@ echo " Username: elastic" echo " Password: ${ELASTIC_PASSWORD:-changeme}" echo "=========================================" echo "" -echo "IMPORTANT: Update service.env with:" -echo " - Your actual server IP/domain in SERVER_PUBLICBASEURL" -echo " - A secure password in ELASTIC_PASSWORD" -echo "" +# Only show reminder if using default values +if [ "${ELASTIC_PASSWORD}" = "changeme" ] || [ -z "${SERVER_PUBLICBASEURL}" ] || [ "${SERVER_PUBLICBASEURL}" = "http://localhost:5601" ]; then + echo "REMINDER: Update service.env with:" + if [ "${ELASTIC_PASSWORD}" = "changeme" ]; then + echo " - A secure password in ELASTIC_PASSWORD" + fi + if [ -z "${SERVER_PUBLICBASEURL}" ] || [ "${SERVER_PUBLICBASEURL}" = "http://localhost:5601" ]; then + echo " - Your actual server IP/domain in SERVER_PUBLICBASEURL" + fi + echo "" +fi echo "Logstash listening on port ${LOGSTASH_BEATS_PORT} for Filebeat clients" echo "" echo "To add client authentication:"