From 3f5c1891c00298b995f039b9579ad1e53650f355 Mon Sep 17 00:00:00 2001 From: t-monaghan Date: Thu, 30 Nov 2023 10:56:05 +1100 Subject: [PATCH] comments changes required for testing --- scripts/bootstrap.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 459e383..f979aa2 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -5,6 +5,8 @@ set -e # Script to install `nix`, `devbox`, `direnv`, and `nix-direnv` and get them all working together NETSKOPE_DATA_DIR="/Library/Application Support/Netskope/STAgent/data" + +# This variable is set by docker in mock_functions.sh to provide the linux path rather than the typical MacOS path NIX_FINAL_SSL_FILE="${NIX_FINAL_SSL_FILE:-NETSKOPE_DATA_DIR/nscacert_combined.pem}" # Copy create Netskope combined cert and save to known location recommended by their docs: @@ -33,6 +35,9 @@ generate_combined_netskope_cert() { install_nix() { echo "=== installing nix (requires sudo)..." curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | + # $INSTALLER_EXTRA_ARGS below is required by docker as default install expects systemd for a linux install + # That alone is able to be set by an env var in the docker environment, + # however we also have to provide 'linux' as an argument for the installing script sh -s -- install $INSTALLER_EXTRA_ARGS --no-confirm \ --extra-conf "trusted-users = root @admin" \ --ssl-cert-file "$NIX_FINAL_SSL_FILE"