accidentally hard coded debian version as 10
This commit is contained in:
4
setup.sh
4
setup.sh
@@ -44,7 +44,6 @@ echo -e -n "${CYAN}Ensure $PUBLIC_IPV4 is whitelisted on the salt master, then p
|
|||||||
read
|
read
|
||||||
|
|
||||||
if ! [ -e /usr/bin/salt-call ]; then
|
if ! [ -e /usr/bin/salt-call ]; then
|
||||||
set -x
|
|
||||||
if [[ "$DISTRO" == "fedora" ]]; then
|
if [[ "$DISTRO" == "fedora" ]]; then
|
||||||
echo -e "${CYAN}Fedora detected - installing Python3.10 if not present, then using a venv${NC}"
|
echo -e "${CYAN}Fedora detected - installing Python3.10 if not present, then using a venv${NC}"
|
||||||
if ! which python3.10 &>/dev/null; then
|
if ! which python3.10 &>/dev/null; then
|
||||||
@@ -87,14 +86,13 @@ if ! [ -e /usr/bin/salt-call ]; then
|
|||||||
[ -f $KEYPATH ] ||
|
[ -f $KEYPATH ] ||
|
||||||
curl -fsSL -o $KEYPATH https://repo.saltproject.io/salt/py3/debian/$OS_VERSION/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg
|
curl -fsSL -o $KEYPATH https://repo.saltproject.io/salt/py3/debian/$OS_VERSION/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg
|
||||||
[ -f /etc/apt/sources.list.d/salt.list ] ||
|
[ -f /etc/apt/sources.list.d/salt.list ] ||
|
||||||
echo "deb [signed-by=$KEYPATH arch=amd64] https://repo.saltproject.io/salt/py3/debian/10/amd64/minor/$SALT_VERSION $CODENAME main" > /etc/apt/sources.list.d/salt.list
|
echo "deb [signed-by=$KEYPATH arch=amd64] https://repo.saltproject.io/salt/py3/debian/$OS_VERSION/amd64/minor/$SALT_VERSION $CODENAME main" > /etc/apt/sources.list.d/salt.list
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get -y install salt-minion
|
apt-get -y install salt-minion
|
||||||
else
|
else
|
||||||
echo -e "${RED}Unrecognized OS${NC}"
|
echo -e "${RED}Unrecognized OS${NC}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
set +x
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
APPLY='salt-call state.apply --master=kpi.keiran.us salt'
|
APPLY='salt-call state.apply --master=kpi.keiran.us salt'
|
||||||
|
|||||||
Reference in New Issue
Block a user