From 86e7c11e7147caee09544899844ff5d52c2d9ce1 Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Wed, 2 Dec 2020 10:40:20 +0000 Subject: [PATCH 1/3] fix mesh nginx --- api/tacticalrmm/tacticalrmm/settings.py | 2 +- install.sh | 80 ++++++++++++------------- restore.sh | 22 +++---- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py index 88c8982fdc..ac23ae1caf 100644 --- a/api/tacticalrmm/tacticalrmm/settings.py +++ b/api/tacticalrmm/tacticalrmm/settings.py @@ -27,7 +27,7 @@ # https://github.com/wh1te909/rmmagent LATEST_AGENT_VER = "1.1.1" -MESH_VER = "0.7.9" +MESH_VER = "0.7.10" SALT_MASTER_VER = "3002.2" diff --git a/install.sh b/install.sh index d0b02fbef9..494a21618d 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION="25" +SCRIPT_VERSION="26" SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/install.sh' GREEN='\033[0;32m' @@ -205,12 +205,47 @@ sudo apt install -y mongodb-org sudo systemctl enable mongod sudo systemctl restart mongod + + +print_green 'Installing python, redis and git' + +sudo apt update +sudo apt install -y python3.8-venv python3.8-dev python3-pip python3-cherrypy3 python3-setuptools python3-wheel ca-certificates redis git + +print_green 'Installing postgresql' + +sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' +wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - +sudo apt update +sudo apt install -y postgresql-13 + +print_green 'Creating database for the rmm' + +sudo -u postgres psql -c "CREATE DATABASE tacticalrmm" +sudo -u postgres psql -c "CREATE USER ${pgusername} WITH PASSWORD '${pgpw}'" +sudo -u postgres psql -c "ALTER ROLE ${pgusername} SET client_encoding TO 'utf8'" +sudo -u postgres psql -c "ALTER ROLE ${pgusername} SET default_transaction_isolation TO 'read committed'" +sudo -u postgres psql -c "ALTER ROLE ${pgusername} SET timezone TO 'UTC'" +sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE tacticalrmm TO ${pgusername}" + +sudo mkdir /rmm +sudo chown ${USER}:${USER} /rmm +sudo mkdir -p /var/log/celery +sudo chown ${USER}:${USER} /var/log/celery +git clone https://github.com/wh1te909/tacticalrmm.git /rmm/ +cd /rmm +git config user.email "admin@example.com" +git config user.name "Bob" +git checkout master + print_green 'Installing MeshCentral' +MESH_VER=$(grep "^MESH_VER" /rmm/api/tacticalrmm/tacticalrmm/settings.py | awk -F'[= "]' '{print $5}') + sudo mkdir -p /meshcentral/meshcentral-data sudo chown ${USER}:${USER} -R /meshcentral cd /meshcentral -npm install meshcentral@0.7.9 +npm install meshcentral@${MESH_VER} sudo chown ${USER}:${USER} -R /meshcentral meshcfg="$(cat << EOF @@ -253,37 +288,6 @@ EOF )" echo "${meshcfg}" > /meshcentral/meshcentral-data/config.json -print_green 'Installing python, redis and git' - -sudo apt update -sudo apt install -y python3.8-venv python3.8-dev python3-pip python3-cherrypy3 python3-setuptools python3-wheel ca-certificates redis git - -print_green 'Installing postgresql' - -sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' -wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - -sudo apt update -sudo apt install -y postgresql-13 - -print_green 'Creating database for the rmm' - -sudo -u postgres psql -c "CREATE DATABASE tacticalrmm" -sudo -u postgres psql -c "CREATE USER ${pgusername} WITH PASSWORD '${pgpw}'" -sudo -u postgres psql -c "ALTER ROLE ${pgusername} SET client_encoding TO 'utf8'" -sudo -u postgres psql -c "ALTER ROLE ${pgusername} SET default_transaction_isolation TO 'read committed'" -sudo -u postgres psql -c "ALTER ROLE ${pgusername} SET timezone TO 'UTC'" -sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE tacticalrmm TO ${pgusername}" - -sudo mkdir /rmm -sudo chown ${USER}:${USER} /rmm -sudo mkdir -p /var/log/celery -sudo chown ${USER}:${USER} /var/log/celery -git clone https://github.com/wh1te909/tacticalrmm.git /rmm/ -cd /rmm -git config user.email "admin@example.com" -git config user.name "Bob" -git checkout master - localvars="$(cat << EOF SECRET_KEY = "${DJANGO_SEKRET}" @@ -504,14 +508,7 @@ nginxmesh="$(cat << EOF server { listen 80; server_name ${meshdomain}; - location / { - proxy_pass http://127.0.0.1:800; - proxy_http_version 1.1; - proxy_set_header X-Forwarded-Host \$host:\$server_port; - proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto \$scheme; - } - + return 301 https://\$server_name\$request_uri; } server { @@ -530,6 +527,7 @@ server { proxy_pass http://127.0.0.1:4430/; proxy_http_version 1.1; + proxy_set_header Host \$host; proxy_set_header Upgrade \$http_upgrade; proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-Host \$host:\$server_port; diff --git a/restore.sh b/restore.sh index 3c3957f90d..486db65371 100755 --- a/restore.sh +++ b/restore.sh @@ -7,7 +7,7 @@ pgpw="hunter2" ##################################################### -SCRIPT_VERSION="8" +SCRIPT_VERSION="9" SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/restore.sh' GREEN='\033[0;32m' @@ -207,15 +207,6 @@ sudo systemctl restart mongod sleep 5 mongorestore --gzip $tmp_dir/meshcentral/mongo -print_green 'Restoring MeshCentral' - -sudo tar -xzf $tmp_dir/meshcentral/mesh.tar.gz -C / -sudo chown ${USER}:${USER} -R /meshcentral -cd /meshcentral -npm install meshcentral@0.7.9 - - -print_green 'Restoring the backend' sudo mkdir /rmm sudo chown ${USER}:${USER} /rmm @@ -227,6 +218,17 @@ git config user.email "admin@example.com" git config user.name "Bob" git checkout master +print_green 'Restoring MeshCentral' + +MESH_VER=$(grep "^MESH_VER" /rmm/api/tacticalrmm/tacticalrmm/settings.py | awk -F'[= "]' '{print $5}') +sudo tar -xzf $tmp_dir/meshcentral/mesh.tar.gz -C / +sudo chown ${USER}:${USER} -R /meshcentral +cd /meshcentral +npm install meshcentral@${MESH_VER} + + +print_green 'Restoring the backend' + cp $tmp_dir/rmm/local_settings.py /rmm/api/tacticalrmm/tacticalrmm/ cp $tmp_dir/rmm/env /rmm/web/.env cp $tmp_dir/rmm/app.ini /rmm/api/tacticalrmm/ From 9a04cf99d75e1b33d43eac61daea123ce25a8908 Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Wed, 2 Dec 2020 11:05:29 +0000 Subject: [PATCH 2/3] fix pending actions ui --- api/tacticalrmm/logs/views.py | 2 +- .../components/modals/logs/PendingActions.vue | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api/tacticalrmm/logs/views.py b/api/tacticalrmm/logs/views.py index a158e219a6..3e4e9ad0d5 100644 --- a/api/tacticalrmm/logs/views.py +++ b/api/tacticalrmm/logs/views.py @@ -114,7 +114,7 @@ def agent_pending_actions(request, pk): @api_view() def all_pending_actions(request): - actions = PendingAction.objects.all() + actions = PendingAction.objects.all().select_related("agent") return Response(PendingActionSerializer(actions, many=True).data) diff --git a/web/src/components/modals/logs/PendingActions.vue b/web/src/components/modals/logs/PendingActions.vue index 3baf28423e..e97a69e4b5 100644 --- a/web/src/components/modals/logs/PendingActions.vue +++ b/web/src/components/modals/logs/PendingActions.vue @@ -11,7 +11,7 @@
Date: Wed, 2 Dec 2020 11:06:34 +0000 Subject: [PATCH 3/3] bump version --- api/tacticalrmm/tacticalrmm/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py index ac23ae1caf..7c2467c00c 100644 --- a/api/tacticalrmm/tacticalrmm/settings.py +++ b/api/tacticalrmm/tacticalrmm/settings.py @@ -15,11 +15,11 @@ AUTH_USER_MODEL = "accounts.User" # latest release -TRMM_VERSION = "0.2.4" +TRMM_VERSION = "0.2.5" # bump this version everytime vue code is changed # to alert user they need to manually refresh their browser -APP_VER = "0.0.94" +APP_VER = "0.0.95" # https://github.com/wh1te909/salt LATEST_SALT_VER = "1.1.0"