handle cloud init hosts file
This commit is contained in:
parent
c993790b7a
commit
716c0fe979
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
SCRIPT_VERSION="74"
|
SCRIPT_VERSION="75"
|
||||||
SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/install.sh'
|
SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/install.sh'
|
||||||
|
|
||||||
sudo apt install -y curl wget dirmngr gnupg lsb-release
|
sudo apt install -y curl wget dirmngr gnupg lsb-release
|
||||||
|
@ -137,6 +137,12 @@ while [[ $letsemail != *[@]*[.]* ]]; do
|
||||||
read letsemail
|
read letsemail
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if grep -q manage_etc_hosts /etc/hosts; then
|
||||||
|
sudo sed -i '/manage_etc_hosts = True/d' /etc/cloud/cloud.cfg >/dev/null
|
||||||
|
echo -e "\nmanage_etc_hosts = False" | sudo tee --append /etc/cloud/cloud.cfg >/dev/null
|
||||||
|
sudo systemctl restart cloud-init >/dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
CHECK_HOSTS=$(grep 127.0.1.1 /etc/hosts | grep "$rmmdomain" | grep "$meshdomain" | grep "$frontenddomain")
|
CHECK_HOSTS=$(grep 127.0.1.1 /etc/hosts | grep "$rmmdomain" | grep "$meshdomain" | grep "$frontenddomain")
|
||||||
HAS_11=$(grep 127.0.1.1 /etc/hosts)
|
HAS_11=$(grep 127.0.1.1 /etc/hosts)
|
||||||
|
|
||||||
|
|
|
@ -410,6 +410,12 @@ deactivate
|
||||||
|
|
||||||
print_green 'Restoring hosts file'
|
print_green 'Restoring hosts file'
|
||||||
|
|
||||||
|
if grep -q manage_etc_hosts /etc/hosts; then
|
||||||
|
sudo sed -i '/manage_etc_hosts = True/d' /etc/cloud/cloud.cfg >/dev/null
|
||||||
|
echo -e "\nmanage_etc_hosts = False" | sudo tee --append /etc/cloud/cloud.cfg >/dev/null
|
||||||
|
sudo systemctl restart cloud-init >/dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
HAS_11=$(grep 127.0.1.1 /etc/hosts)
|
HAS_11=$(grep 127.0.1.1 /etc/hosts)
|
||||||
if [[ $HAS_11 ]]; then
|
if [[ $HAS_11 ]]; then
|
||||||
sudo sed -i "/127.0.1.1/s/$/ ${API} ${webdomain} ${meshdomain}/" /etc/hosts
|
sudo sed -i "/127.0.1.1/s/$/ ${API} ${webdomain} ${meshdomain}/" /etc/hosts
|
||||||
|
|
23
update.sh
23
update.sh
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
SCRIPT_VERSION="145"
|
SCRIPT_VERSION="146"
|
||||||
SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/update.sh'
|
SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/update.sh'
|
||||||
LATEST_SETTINGS_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/api/tacticalrmm/tacticalrmm/settings.py'
|
LATEST_SETTINGS_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/api/tacticalrmm/tacticalrmm/settings.py'
|
||||||
YELLOW='\033[1;33m'
|
YELLOW='\033[1;33m'
|
||||||
|
@ -357,8 +357,29 @@ python manage.py clear_redis_celery_locks
|
||||||
python manage.py post_update_tasks
|
python manage.py post_update_tasks
|
||||||
API=$(python manage.py get_config api)
|
API=$(python manage.py get_config api)
|
||||||
WEB_VERSION=$(python manage.py get_config webversion)
|
WEB_VERSION=$(python manage.py get_config webversion)
|
||||||
|
FRONTEND=$(python manage.py get_config webdomain)
|
||||||
|
MESHDOMAIN=$(python manage.py get_config meshdomain)
|
||||||
deactivate
|
deactivate
|
||||||
|
|
||||||
|
if grep -q manage_etc_hosts /etc/hosts; then
|
||||||
|
sudo sed -i '/manage_etc_hosts = True/d' /etc/cloud/cloud.cfg >/dev/null
|
||||||
|
if ! grep -q "manage_etc_hosts = False" /etc/cloud/cloud.cfg; then
|
||||||
|
echo -e "\nmanage_etc_hosts = False" | sudo tee --append /etc/cloud/cloud.cfg >/dev/null
|
||||||
|
sudo systemctl restart cloud-init >/dev/null
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
CHECK_HOSTS=$(grep 127.0.1.1 /etc/hosts | grep "$API" | grep "$FRONTEND" | grep "$MESHDOMAIN")
|
||||||
|
HAS_11=$(grep 127.0.1.1 /etc/hosts)
|
||||||
|
|
||||||
|
if ! [[ $CHECK_HOSTS ]]; then
|
||||||
|
if [[ $HAS_11 ]]; then
|
||||||
|
sudo sed -i "/127.0.1.1/s/$/ ${API} ${FRONTEND} ${MESHDOMAIN}/" /etc/hosts
|
||||||
|
else
|
||||||
|
echo "127.0.1.1 ${API} ${FRONTEND} ${MESHDOMAIN}" | sudo tee --append /etc/hosts >/dev/null
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -d /rmm/web ]; then
|
if [ -d /rmm/web ]; then
|
||||||
rm -rf /rmm/web
|
rm -rf /rmm/web
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue