diff --git a/setup.sh b/setup.sh index 281fd2c..3f8cbf8 100644 --- a/setup.sh +++ b/setup.sh @@ -13,7 +13,8 @@ PIP_EXTRA_ARGS=$PIP_EXTRA_ARGS PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net} PIP_INDEX_URL=${PIP_INDEX_URL:-"https://pypi.org/simple"} CIC_SETUP_TRUSTED_FINGERPRINT=${CIC_SETUP_TRUSTED_FINGERPRINT:-0826EDA1702D1E87C6E2875121D2E7BB88C2A746} -CIC_ROOT_URL=${CIC_ROOT_URL:-https://root.grassrootseconomics.net} +CIC_ROOT_URL=${CIC_ROOT_URL:-https://root.grassrootseconomics.net/env/dev} +CIC_ROOT_CA_FILE=${CIC_ROOT_CA_FILE:-keys/ge.ca} if [ "$UID" -eq 0 ]; then dbg $dbg_error "This cannot be run as root" @@ -48,7 +49,7 @@ if [ ! -e "$HOME/.config/cic/staff-client/.envinit" ]; then v=${!c} if [ -z "$v" ]; then d=`mktemp -d` - curl -X GET $CIC_ROOT_URL/cic-staff-client/$c -o $d/$c + curl -X GET --cacert $CIC_ROOT_CA_FILE $CIC_ROOT_URL/$c -o $d/$c gpg --homedir $HOME/.local/share/cic/.gnupg --verify $d/$c v=`gpg --homedir $HOME/.local/share/cic/.gnupg -d $d/$c` echo $v >> $t