From 9045ee5def56dce66e93da1c66a5cf81650f4faf Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 20 Sep 2025 09:18:46 +1200 Subject: [PATCH] just fixes --- logclient/config/service.env | 3 +++ logserver/config/api-keys.yml | 5 +++++ logserver/config/service.env | 3 +++ logserver/generate-api-key.sh | 5 +++-- 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 logserver/config/api-keys.yml diff --git a/logclient/config/service.env b/logclient/config/service.env index bfd378c..0e4f4c2 100644 --- a/logclient/config/service.env +++ b/logclient/config/service.env @@ -1,6 +1,9 @@ # Service identification CONTAINER_NAME=logclient-filebeat +# Server settings (REQUIRED by dropshell) +SSH_USER="root" + # Docker image tag override (optional) IMAGE_TAG="7.17.23" diff --git a/logserver/config/api-keys.yml b/logserver/config/api-keys.yml new file mode 100644 index 0000000..357e6a1 --- /dev/null +++ b/logserver/config/api-keys.yml @@ -0,0 +1,5 @@ +# API Keys for LogServer Authentication +# Format: hostname:api_key +# Generated by generate-api-key.sh + +api_keys: diff --git a/logserver/config/service.env b/logserver/config/service.env index 74f2c71..00dd341 100644 --- a/logserver/config/service.env +++ b/logserver/config/service.env @@ -1,6 +1,9 @@ # Service identification CONTAINER_NAME=logserver +# Server settings (REQUIRED by dropshell) +SSH_USER="root" + # Elasticsearch settings ES_VERSION=7.17.23 ES_HEAP_SIZE=2g diff --git a/logserver/generate-api-key.sh b/logserver/generate-api-key.sh index 7c54591..34b3195 100755 --- a/logserver/generate-api-key.sh +++ b/logserver/generate-api-key.sh @@ -60,9 +60,10 @@ while true; do break fi - # Validate hostname - if [[ ! "$hostname" =~ ^[a-zA-Z0-9][a-zA-Z0-9-_.]*$ ]]; then + # Validate hostname - allow simple names, must start with alphanumeric + if [[ ! "$hostname" =~ ^[a-zA-Z0-9]([a-zA-Z0-9._-]*[a-zA-Z0-9])?$ ]]; then echo -e "${RED}Invalid hostname format. Use only letters, numbers, dots, dashes, and underscores.${NC}" + echo -e "${RED}Hostname must start and end with a letter or number.${NC}" continue fi