From 9421ae25f709e5327d95cfa032342b99c54dcbd8 Mon Sep 17 00:00:00 2001
From: wh1te909 <dcparsi@gmail.com>
Date: Thu, 21 Apr 2022 20:32:41 +0000
Subject: [PATCH] update scripts and reqs

---
 api/tacticalrmm/requirements.txt        | 2 +-
 api/tacticalrmm/tacticalrmm/settings.py | 8 ++++----
 backup.sh                               | 2 +-
 install.sh                              | 6 +-----
 restore.sh                              | 2 +-
 update.sh                               | 7 ++++++-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/api/tacticalrmm/requirements.txt b/api/tacticalrmm/requirements.txt
index e183751e..68f03e1e 100644
--- a/api/tacticalrmm/requirements.txt
+++ b/api/tacticalrmm/requirements.txt
@@ -27,7 +27,7 @@ hiredis==2.0.0
 requests==2.27.1
 six==1.16.0
 sqlparse==0.4.2
-twilio==7.8.1
+twilio==7.8.2
 urllib3==1.26.9
 uWSGI==2.0.20
 validators==0.18.2
diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py
index b884e050..2069eeaf 100644
--- a/api/tacticalrmm/tacticalrmm/settings.py
+++ b/api/tacticalrmm/tacticalrmm/settings.py
@@ -17,11 +17,11 @@ LINUX_AGENT_SCRIPT = BASE_DIR / "core" / "agent_linux.sh"
 AUTH_USER_MODEL = "accounts.User"
 
 # latest release
-TRMM_VERSION = "0.12.5-dev"
+TRMM_VERSION = "0.13.0-dev"
 
 # bump this version everytime vue code is changed
 # to alert user they need to manually refresh their browser
-APP_VER = "0.0.160"
+APP_VER = "0.0.161"
 
 # https://github.com/amidaware/rmmagent
 LATEST_AGENT_VER = "2.0.2"
@@ -31,8 +31,8 @@ MESH_VER = "1.0.2"
 NATS_SERVER_VER = "2.7.4"
 
 # for the update script, bump when need to recreate venv or npm install
-PIP_VER = "28"
-NPM_VER = "31"
+PIP_VER = "29"
+NPM_VER = "32"
 
 SETUPTOOLS_VER = "59.6.0"
 WHEEL_VER = "0.37.1"
diff --git a/backup.sh b/backup.sh
index 97cc906a..2b8cf850 100755
--- a/backup.sh
+++ b/backup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION="18"
+SCRIPT_VERSION="19"
 SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/backup.sh'
 
 GREEN='\033[0;32m'
diff --git a/install.sh b/install.sh
index 4a760f39..a4a9a77a 100644
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION="61"
+SCRIPT_VERSION="62"
 SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/install.sh'
 
 sudo apt install -y curl wget dirmngr gnupg lsb-release
@@ -211,10 +211,6 @@ sudo rm -rf Python-${PYTHON_VER} Python-${PYTHON_VER}.tgz
 print_green 'Installing redis and git'
 sudo apt install -y ca-certificates redis git
 
-# apply redis configuration
-sudo redis-cli config set appendonly no
-sudo redis-cli config rewrite
-
 print_green 'Installing postgresql'
 
 echo "$postgresql_repo" | sudo tee /etc/apt/sources.list.d/pgdg.list
diff --git a/restore.sh b/restore.sh
index a44a80b8..64b35ade 100755
--- a/restore.sh
+++ b/restore.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION="35"
+SCRIPT_VERSION="36"
 SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/restore.sh'
 
 sudo apt update
diff --git a/update.sh b/update.sh
index 7c8f6b0a..56210c30 100644
--- a/update.sh
+++ b/update.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION="133"
+SCRIPT_VERSION="134"
 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'
 YELLOW='\033[1;33m'
@@ -303,6 +303,11 @@ python manage.py create_natsapi_conf
 python manage.py post_update_tasks
 deactivate
 
+printf >&2 "${GREEN}Turning off redis aof${NC}\n"
+sudo redis-cli config set appendonly no
+sudo redis-cli config rewrite
+sudo rm -f /var/lib/redis/appendonly.aof
+
 rm -rf /rmm/web/dist
 rm -rf /rmm/web/.quasar
 cd /rmm/web