From 3e5427a7f68f0a634d24f7c36f7e8bc028214592 Mon Sep 17 00:00:00 2001 From: Jack Meixensperger Date: Thu, 7 Nov 2024 12:19:39 -0800 Subject: [PATCH 1/3] update --accept-license setup message --- splunk/common-files/entrypoint.sh | 6 +++++- uf/common-files/entrypoint.sh | 10 +++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/splunk/common-files/entrypoint.sh b/splunk/common-files/entrypoint.sh index 02f8b492..d7ccdff1 100755 --- a/splunk/common-files/entrypoint.sh +++ b/splunk/common-files/entrypoint.sh @@ -18,7 +18,11 @@ set -e setup() { # Check if the user accepted the license if [[ "$SPLUNK_START_ARGS" != *"--accept-license"* ]]; then - printf "License not accepted, please ensure the environment variable SPLUNK_START_ARGS contains the '--accept-license' flag\n" + printf "License not accepted, please adjust SPLUNK_START_ARGS to indicate you have accepted the license.\n" + printf "The license you are accepting is the Splunk General Terms, available here: https://www.splunk.com/en_us/legal/splunk-general-terms.html\n" + printf "Unless you have jointly executed with Splunk a negotiated version of these General Terms that explicitly supersedes this agreement, by accessing or using Splunk software, you are agreeing to the Splunk General Terms.\n" + printf "Please read and make sure you agree to the Splunk General Terms before you access or use this software.\n" + printf "Only once you've done so should you include the '--accept-license' flag to indicate your acceptance of the Splunk General Terms and launch this software.\n" printf "For example: docker run -e SPLUNK_START_ARGS=--accept-license -e SPLUNK_PASSWORD splunk/splunk\n\n" printf "For additional information and examples, see the help: docker run -it splunk/splunk help\n" exit 1 diff --git a/uf/common-files/entrypoint.sh b/uf/common-files/entrypoint.sh index 19c24dae..bce3dee7 100755 --- a/uf/common-files/entrypoint.sh +++ b/uf/common-files/entrypoint.sh @@ -19,9 +19,13 @@ set -e setup() { # Check if the user accepted the license if [[ "$SPLUNK_START_ARGS" != *"--accept-license"* ]]; then - printf "License not accepted, please ensure the environment variable SPLUNK_START_ARGS contains the '--accept-license' flag\n" - printf "For example: docker run -e SPLUNK_START_ARGS=--accept-license splunk/universalforwarder\n\n" - printf "For additional information and examples, see the help: docker run -it splunk/universalforwarder help\n" + printf "License not accepted, please adjust SPLUNK_START_ARGS to indicate you have accepted the license.\n" + printf "The license you are accepting is the Splunk General Terms, available here: https://www.splunk.com/en_us/legal/splunk-general-terms.html\n" + printf "Unless you have jointly executed with Splunk a negotiated version of these General Terms that explicitly supersedes this agreement, by accessing or using Splunk software, you are agreeing to the Splunk General Terms.\n" + printf "Please read and make sure you agree to the Splunk General Terms before you access or use this software.\n" + printf "Only once you've done so should you include the '--accept-license' flag to indicate your acceptance of the Splunk General Terms and launch this software.\n" + printf "For example: docker run -e SPLUNK_START_ARGS=--accept-license -e SPLUNK_PASSWORD splunk/splunk\n\n" + printf "For additional information and examples, see the help: docker run -it splunk/splunk help\n" exit 1 fi } From 507fa78a9896c3667494732dc04ac0980a833019 Mon Sep 17 00:00:00 2001 From: Jack Meixensperger Date: Thu, 7 Nov 2024 12:50:55 -0800 Subject: [PATCH 2/3] revert uf example --- uf/common-files/entrypoint.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/uf/common-files/entrypoint.sh b/uf/common-files/entrypoint.sh index bce3dee7..9f559809 100755 --- a/uf/common-files/entrypoint.sh +++ b/uf/common-files/entrypoint.sh @@ -23,9 +23,8 @@ setup() { printf "The license you are accepting is the Splunk General Terms, available here: https://www.splunk.com/en_us/legal/splunk-general-terms.html\n" printf "Unless you have jointly executed with Splunk a negotiated version of these General Terms that explicitly supersedes this agreement, by accessing or using Splunk software, you are agreeing to the Splunk General Terms.\n" printf "Please read and make sure you agree to the Splunk General Terms before you access or use this software.\n" - printf "Only once you've done so should you include the '--accept-license' flag to indicate your acceptance of the Splunk General Terms and launch this software.\n" - printf "For example: docker run -e SPLUNK_START_ARGS=--accept-license -e SPLUNK_PASSWORD splunk/splunk\n\n" - printf "For additional information and examples, see the help: docker run -it splunk/splunk help\n" + printf "Only once you've done so should you include the '--accept-license' flag to indicate your acceptance of the Splunk General Terms and launch this software.\n" printf "For example: docker run -e SPLUNK_START_ARGS=--accept-license splunk/universalforwarder\n\n" + printf "For additional information and examples, see the help: docker run -it splunk/universalforwarder help\n" exit 1 fi } From 661d9ad93fb6d1f53203557b531cd7b566db989b Mon Sep 17 00:00:00 2001 From: Jack Meixensperger Date: Thu, 7 Nov 2024 12:52:15 -0800 Subject: [PATCH 3/3] fix indent --- uf/common-files/entrypoint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/uf/common-files/entrypoint.sh b/uf/common-files/entrypoint.sh index 9f559809..e54a014c 100755 --- a/uf/common-files/entrypoint.sh +++ b/uf/common-files/entrypoint.sh @@ -23,7 +23,8 @@ setup() { printf "The license you are accepting is the Splunk General Terms, available here: https://www.splunk.com/en_us/legal/splunk-general-terms.html\n" printf "Unless you have jointly executed with Splunk a negotiated version of these General Terms that explicitly supersedes this agreement, by accessing or using Splunk software, you are agreeing to the Splunk General Terms.\n" printf "Please read and make sure you agree to the Splunk General Terms before you access or use this software.\n" - printf "Only once you've done so should you include the '--accept-license' flag to indicate your acceptance of the Splunk General Terms and launch this software.\n" printf "For example: docker run -e SPLUNK_START_ARGS=--accept-license splunk/universalforwarder\n\n" + printf "Only once you've done so should you include the '--accept-license' flag to indicate your acceptance of the Splunk General Terms and launch this software.\n" + printf "For example: docker run -e SPLUNK_START_ARGS=--accept-license splunk/universalforwarder\n\n" printf "For additional information and examples, see the help: docker run -it splunk/universalforwarder help\n" exit 1 fi