paulmataruso/tacticalrmm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update reqs

Browse Source
This commit is contained in:
wh1te909
2021-05-05 01:41:39 +00:00
parent a8d56921d5
commit 63951705cd
7 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/tacticalrmm/requirements.txt
View File

@@ -7,7 +7,7 @@ channels==3.0.3
chardet==4.0.0
cryptography==3.4.7
daphne==3.0.2
Django==3.2.0
Django==3.2.1
django-cors-headers==3.7.0
django-rest-knox==4.1.0
djangorestframework==3.12.4
@@ -27,7 +27,7 @@ redis==3.5.3
requests==2.25.1
six==1.15.0
sqlparse==0.4.1
twilio==6.56.0
twilio==6.57.0
urllib3==1.26.4
uWSGI==2.0.19.1
validators==0.18.2

3
api/tacticalrmm/tacticalrmm/settings.py
View File

@@ -30,6 +30,9 @@ MESH_VER = "0.8.19"
PIP_VER = "15"
NPM_VER = "14"
SETUPTOOLS_VER = "56.1.0"
WHEEL_VER = "0.36.2"
DL_64 = f"https://github.com/wh1te909/rmmagent/releases/download/v{LATEST_AGENT_VER}/winagent-v{LATEST_AGENT_VER}.exe"
DL_32 = f"https://github.com/wh1te909/rmmagent/releases/download/v{LATEST_AGENT_VER}/winagent-v{LATEST_AGENT_VER}-x86.exe"

5
install.sh
View File

@@ -354,12 +354,15 @@ sudo chmod +x /usr/local/bin/nats-api
print_green 'Installing the backend'
SETUPTOOLS_VER=$(grep "^SETUPTOOLS_VER" /rmm/api/tacticalrmm/tacticalrmm/settings.py | awk -F'[= "]' '{print $5}')
WHEEL_VER=$(grep "^WHEEL_VER" /rmm/api/tacticalrmm/tacticalrmm/settings.py | awk -F'[= "]' '{print $5}')
cd /rmm/api
python3.9 -m venv env
source /rmm/api/env/bin/activate
cd /rmm/api/tacticalrmm
pip install --no-cache-dir --upgrade pip
pip install --no-cache-dir setuptools==54.2.0 wheel==0.36.2
pip install --no-cache-dir setuptools==${SETUPTOOLS_VER} wheel==${WHEEL_VER}
pip install --no-cache-dir -r /rmm/api/tacticalrmm/requirements.txt
python manage.py migrate
python manage.py collectstatic --no-input

5
restore.sh
View File

@@ -286,12 +286,15 @@ sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE tacticalrmm TO ${pgus
gzip -d $tmp_dir/postgres/*.psql.gz
PGPASSWORD=${pgpw} psql -h localhost -U ${pgusername} -d tacticalrmm -f $tmp_dir/postgres/db*.psql
SETUPTOOLS_VER=$(grep "^SETUPTOOLS_VER" /rmm/api/tacticalrmm/tacticalrmm/settings.py | awk -F'[= "]' '{print $5}')
WHEEL_VER=$(grep "^WHEEL_VER" /rmm/api/tacticalrmm/tacticalrmm/settings.py | awk -F'[= "]' '{print $5}')
cd /rmm/api
python3.9 -m venv env
source /rmm/api/env/bin/activate
cd /rmm/api/tacticalrmm
pip install --no-cache-dir --upgrade pip
pip install --no-cache-dir setuptools==54.2.0 wheel==0.36.2
pip install --no-cache-dir setuptools==${SETUPTOOLS_VER} wheel==${WHEEL_VER}
pip install --no-cache-dir -r /rmm/api/tacticalrmm/requirements.txt
python manage.py migrate
python manage.py collectstatic --no-input

5
update.sh
View File

@@ -67,6 +67,9 @@ LATEST_NPM_VER=$(grep "^NPM_VER" "$TMP_SETTINGS" | awk -F'[= "]' '{print $5}')
CURRENT_PIP_VER=$(grep "^PIP_VER" "$SETTINGS_FILE" | awk -F'[= "]' '{print $5}')
CURRENT_NPM_VER=$(grep "^NPM_VER" "$SETTINGS_FILE" | awk -F'[= "]' '{print $5}')
SETUPTOOLS_VER=$(grep "^SETUPTOOLS_VER" "$SETTINGS_FILE" | awk -F'[= "]' '{print $5}')
WHEEL_VER=$(grep "^WHEEL_VER" "$SETTINGS_FILE" | awk -F'[= "]' '{print $5}')
if [ -f /etc/systemd/system/natsapi.service ]; then
printf >&2 "${GREEN}Removing natsapi.service${NC}\n"
sudo systemctl stop natsapi.service
@@ -256,7 +259,7 @@ if [[ "${CURRENT_PIP_VER}" != "${LATEST_PIP_VER}" ]] || [[ "$force" = true ]]; t
source /rmm/api/env/bin/activate
cd /rmm/api/tacticalrmm
pip install --no-cache-dir --upgrade pip
pip install --no-cache-dir setuptools==54.2.0 wheel==0.36.2
pip install --no-cache-dir setuptools==${SETUPTOOLS_VER} wheel==${WHEEL_VER}
pip install --no-cache-dir -r requirements.txt
else
source /rmm/api/env/bin/activate

57
web/package-lock.json generated
View File

@@ -7,20 +7,20 @@
"": {
"version": "0.1.8",
"dependencies": {
"@quasar/extras": "^1.10.2",
"@quasar/extras": "^1.10.4",
"apexcharts": "^3.23.1",
"axios": "^0.21.1",
"dotenv": "^8.2.0",
"prismjs": "^1.22.0",
"qrcode.vue": "^1.7.0",
"quasar": "^1.15.10",
"quasar": "^1.15.13",
"vue-apexcharts": "^1.6.0",
"vue-prism-editor": "^1.2.2"
},
"devDependencies": {
"@quasar/app": "^2.2.4",
"@quasar/app": "^2.2.6",
"@quasar/cli": "^1.1.3",
"core-js": "^3.10.1",
"core-js": "^3.11.2",
"eslint-plugin-cypress": "^2.11.2",
"flush-promises": "^1.0.2",
"fs-extra": "^9.1.0"
@@ -1654,10 +1654,11 @@
}
},
"node_modules/@quasar/app": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/@quasar/app/-/app-2.2.4.tgz",
"integrity": "sha512-6Y7R5oFJ9UbEDjAbw5bPamcZWSZ0rSyFTB8IOxKkt0QFFIzKKbGkpzvYlp+gMj/SBBS92PnNyof77fjVF0U6Pg==",
"version": "2.2.6",
"resolved": "https://registry.npmjs.org/@quasar/app/-/app-2.2.6.tgz",
"integrity": "sha512-wYgY11e6VLtBU5tEgbCny6h+C8mr1//F4XvaJYLolE7+1HFxUF5Z9QukPkMLxtwf+N/ms5woT29/Y2T1j6rbqw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@quasar/babel-preset-app": "2.0.1",
"@quasar/fastclick": "1.1.4",
@@ -1901,9 +1902,9 @@
}
},
"node_modules/@quasar/extras": {
"version": "1.10.2",
"resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.10.2.tgz",
"integrity": "sha512-S5aE/If4Bgl6qAoHqDZcVw6GxeNpksix3N1dp8k3YPMniIaoU/BLACeQYnrGkn3ffZ1+5JzF0teAE3no6WGzEg==",
"version": "1.10.4",
"resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.10.4.tgz",
"integrity": "sha512-FIXvYZPTKFjBmMb9CNMkEqXTgNppixRLWdaZKKb1qn/CScn+jipPzMBOwCfAFwsNPeAGXTwFT1/xzhLWIbwzAw==",
"funding": {
"type": "github",
"url": "https://donate.quasar.dev"
@@ -4707,9 +4708,9 @@
}
},
"node_modules/core-js": {
"version": "3.10.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.1.tgz",
"integrity": "sha512-pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA==",
"version": "3.11.2",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.2.tgz",
"integrity": "sha512-3tfrrO1JpJSYGKnd9LKTBPqgUES/UYiCzMKeqwR1+jF16q4kD1BY2NvqkfuzXwQ6+CIWm55V9cjD7PQd+hijdw==",
"dev": true,
"hasInstallScript": true,
"funding": {
@@ -13386,9 +13387,9 @@
}
},
"node_modules/quasar": {
"version": "1.15.10",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-1.15.10.tgz",
"integrity": "sha512-75NXx4EHN2oWxQwbCBxfICs8xbZ5QWHNf5+09CY3YDo4gTAYITtJGdEu2hqxKUTstYAdJ/996HzKq88G0Kq7rQ==",
"version": "1.15.13",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-1.15.13.tgz",
"integrity": "sha512-71h+IwSC5NocvinNHaxXqRWvIyx4DClcwi4iANHqmgYcpXPwWEgGAiE8lSaZMGyTkUC+e/yshRj57s6RvhoHHw==",
"engines": {
"node": ">= 10.0.0",
"npm": ">= 5.6.0",
@@ -20555,9 +20556,9 @@
"dev": true
},
"@quasar/app": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/@quasar/app/-/app-2.2.4.tgz",
"integrity": "sha512-6Y7R5oFJ9UbEDjAbw5bPamcZWSZ0rSyFTB8IOxKkt0QFFIzKKbGkpzvYlp+gMj/SBBS92PnNyof77fjVF0U6Pg==",
"version": "2.2.6",
"resolved": "https://registry.npmjs.org/@quasar/app/-/app-2.2.6.tgz",
"integrity": "sha512-wYgY11e6VLtBU5tEgbCny6h+C8mr1//F4XvaJYLolE7+1HFxUF5Z9QukPkMLxtwf+N/ms5woT29/Y2T1j6rbqw==",
"dev": true,
"requires": {
"@quasar/babel-preset-app": "2.0.1",
@@ -20755,9 +20756,9 @@
}
},
"@quasar/extras": {
"version": "1.10.2",
"resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.10.2.tgz",
"integrity": "sha512-S5aE/If4Bgl6qAoHqDZcVw6GxeNpksix3N1dp8k3YPMniIaoU/BLACeQYnrGkn3ffZ1+5JzF0teAE3no6WGzEg=="
"version": "1.10.4",
"resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.10.4.tgz",
"integrity": "sha512-FIXvYZPTKFjBmMb9CNMkEqXTgNppixRLWdaZKKb1qn/CScn+jipPzMBOwCfAFwsNPeAGXTwFT1/xzhLWIbwzAw=="
},
"@quasar/fastclick": {
"version": "1.1.4",
@@ -23129,9 +23130,9 @@
}
},
"core-js": {
"version": "3.10.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.1.tgz",
"integrity": "sha512-pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA==",
"version": "3.11.2",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.2.tgz",
"integrity": "sha512-3tfrrO1JpJSYGKnd9LKTBPqgUES/UYiCzMKeqwR1+jF16q4kD1BY2NvqkfuzXwQ6+CIWm55V9cjD7PQd+hijdw==",
"dev": true
},
"core-js-compat": {
@@ -30193,9 +30194,9 @@
"dev": true
},
"quasar": {
"version": "1.15.10",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-1.15.10.tgz",
"integrity": "sha512-75NXx4EHN2oWxQwbCBxfICs8xbZ5QWHNf5+09CY3YDo4gTAYITtJGdEu2hqxKUTstYAdJ/996HzKq88G0Kq7rQ=="
"version": "1.15.13",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-1.15.13.tgz",
"integrity": "sha512-71h+IwSC5NocvinNHaxXqRWvIyx4DClcwi4iANHqmgYcpXPwWEgGAiE8lSaZMGyTkUC+e/yshRj57s6RvhoHHw=="
},
"query-string": {
"version": "5.1.1",

8
web/package.json
View File

@@ -10,20 +10,20 @@
"test:e2e:ci": "cross-env E2E_TEST=true start-test \"quasar dev\" http-get://localhost:8080 \"cypress run\""
},
"dependencies": {
"@quasar/extras": "^1.10.2",
"@quasar/extras": "^1.10.4",
"apexcharts": "^3.23.1",
"axios": "^0.21.1",
"dotenv": "^8.2.0",
"prismjs": "^1.22.0",
"qrcode.vue": "^1.7.0",
"quasar": "^1.15.10",
"quasar": "^1.15.13",
"vue-apexcharts": "^1.6.0",
"vue-prism-editor": "^1.2.2"
},
"devDependencies": {
"@quasar/app": "^2.2.4",
"@quasar/app": "^2.2.6",
"@quasar/cli": "^1.1.3",
"core-js": "^3.10.1",
"core-js": "^3.11.2",
"eslint-plugin-cypress": "^2.11.2",
"flush-promises": "^1.0.2",
"fs-extra": "^9.1.0"