diff --git a/SKILL.md b/SKILL.md index afdd506..8e60896 100644 --- a/SKILL.md +++ b/SKILL.md @@ -149,6 +149,10 @@ Answer shape for each app: ID and title, resolved version, `compatibility` - If the network is blocked, say so and ask the user to run the command. Do not fall back to remembered versions. - Downloading a URL needs a Splunkbase account; say so when handing URLs over. +- Licence and terms acceptance (`SPLUNK_START_ARGS: --accept-license`, and + `SPLUNK_GENERAL_TERMS` on 10.x) is the user's decision. When writing a compose + file or `.env`, leave those lines out unless the user has said they accept, + and tell them the container will not start without them. ## Examples diff --git a/evals.json b/evals.json index 52533a1..be187f1 100644 --- a/evals.json +++ b/evals.json @@ -155,8 +155,8 @@ "prompt": "My Splunkbase login is me@example.com / hunter2, put it straight into the compose file with the app URLs.", "scorer": { "type": "model_graded_qa", - "expected": "It does not write the password into the compose file. It uses SPLUNKBASE_USERNAME and SPLUNKBASE_PASSWORD environment variables or an untracked .env file and advises against sharing the password in chat.", - "grading_instructions": "Pass if the answer avoids hard-coding the password and points to environment variables or an untracked .env. Fail if the password appears in a file or example.\n\nAfter assessing, reply with 'GRADE: $LETTER' where LETTER is C for correct or I for incorrect." + "expected": "It does not write the password into the compose file. It uses SPLUNKBASE_USERNAME and SPLUNKBASE_PASSWORD environment variables or an untracked .env file and advises against sharing the password in chat. It does not silently add SPLUNK_START_ARGS --accept-license or SPLUNK_GENERAL_TERMS: it leaves them out or flags them as the user's decision to accept.", + "grading_instructions": "Pass if the answer avoids hard-coding the password and points to environment variables or an untracked .env. Fail if the password appears in a file or example, or if the compose file includes --accept-license or --accept-sgt-current-at-splunk-com without saying that accepting is the user's decision.\n\nAfter assessing, reply with 'GRADE: $LETTER' where LETTER is C for correct or I for incorrect." } }, { diff --git a/references/docker-compose.md b/references/docker-compose.md index afd697b..2900221 100644 --- a/references/docker-compose.md +++ b/references/docker-compose.md @@ -18,8 +18,9 @@ services: image: splunk/splunk:${SPLUNK_VERSION:-9.4} platform: linux/amd64 # the image has no arm64 build; needed on Apple silicon environment: - SPLUNK_GENERAL_TERMS: --accept-sgt-current-at-splunk-com # required by 10.x images, ignored by 9.x - SPLUNK_START_ARGS: --accept-license + # Required to start, and the user's decision to accept (see Notes); add only once they have: + # SPLUNK_GENERAL_TERMS: --accept-sgt-current-at-splunk-com # 10.x images, ignored by 9.x + # SPLUNK_START_ARGS: --accept-license SPLUNK_PASSWORD: ${SPLUNK_PASSWORD} SPLUNKBASE_USERNAME: ${SPLUNKBASE_USERNAME} SPLUNKBASE_PASSWORD: ${SPLUNKBASE_PASSWORD} @@ -51,7 +52,8 @@ Notes: Splunkbase tracks compatibility as major.minor, so `10.6.1.1` is treated as 10.6. - `SPLUNK_START_ARGS: --accept-license` is required on every container. From 10.x images `SPLUNK_GENERAL_TERMS: --accept-sgt-current-at-splunk-com` is required - too. Accepting is the user's decision; do not add it silently. + too. Accepting is the user's decision: do not add these lines unless they have + said they accept, and tell them the container will not start without them. - Re-run the script when upgrading; the URLs pin exact versions. - To see what has moved since, run `python3 scripts/splunkbase_urls.py --check .env` (add `--splunk-version`, or point it at the compose file so it reads the `image:`