diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 3665fb1f..ebec5409 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -120,10 +120,7 @@ services: container_name: trmm-redis-dev restart: always user: 1000:1000 - command: redis-server --appendonly yes image: redis:6.0-alpine - volumes: - - redis-data-dev:/data networks: dev: aliases: @@ -153,7 +150,6 @@ services: volumes: - tactical-data-dev:/opt/tactical - mesh-data-dev:/meshcentral-data - - redis-data-dev:/redis/data - mongo-dev-data:/mongo/data/db - ..:/workspace:cached @@ -236,7 +232,6 @@ volumes: postgres-data-dev: null mongo-dev-data: null mesh-data-dev: null - redis-data-dev: null networks: dev: diff --git a/backup.sh b/backup.sh index 91d5724b..97cc906a 100755 --- a/backup.sh +++ b/backup.sh @@ -55,7 +55,6 @@ mkdir ${tmp_dir}/nginx mkdir ${tmp_dir}/systemd mkdir ${tmp_dir}/rmm mkdir ${tmp_dir}/confd -mkdir ${tmp_dir}/redis pg_dump --dbname=postgresql://"${POSTGRES_USER}":"${POSTGRES_PW}"@127.0.0.1:5432/tacticalrmm | gzip -9 > ${tmp_dir}/postgres/db-${dt_now}.psql.gz @@ -69,8 +68,6 @@ sudo tar -czvf ${tmp_dir}/nginx/etc-nginx.tar.gz -C /etc/nginx . sudo tar -czvf ${tmp_dir}/confd/etc-confd.tar.gz -C /etc/conf.d . -sudo gzip -9 -c /var/lib/redis/appendonly.aof > ${tmp_dir}/redis/appendonly.aof.gz - sudo cp ${sysd}/rmm.service ${sysd}/celery.service ${sysd}/celerybeat.service ${sysd}/meshcentral.service ${sysd}/nats.service ${sysd}/daphne.service ${tmp_dir}/systemd/ if [ -f "${sysd}/nats-api.service" ]; then sudo cp ${sysd}/nats-api.service ${tmp_dir}/systemd/ diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 6cd2b9d8..6b7a0089 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -10,14 +10,14 @@ networks: - subnet: 172.20.0.0/24 api-db: null redis: null - mesh-db: null # docker managed persistent volumes + mesh-db: null +# docker managed persistent volumes volumes: tactical_data: null postgres_data: null mongo_data: null mesh_data: null - redis_data: null services: # postgres database for api service @@ -39,10 +39,7 @@ services: container_name: trmm-redis image: redis:6.0-alpine user: 1000:1000 - command: redis-server --appendonly yes restart: always - volumes: - - redis_data:/data networks: - redis @@ -71,7 +68,6 @@ services: - tactical_data:/opt/tactical - mesh_data:/meshcentral-data - mongo_data:/mongo/data/db - - redis_data:/redis/data # nats tactical-nats: diff --git a/install.sh b/install.sh index 4cd6d1e1..39822d84 100644 --- a/install.sh +++ b/install.sh @@ -212,7 +212,7 @@ print_green 'Installing redis and git' sudo apt install -y ca-certificates redis git # apply redis configuration -sudo redis-cli config set appendonly yes +sudo redis-cli config set appendonly no sudo redis-cli config rewrite print_green 'Installing postgresql' diff --git a/restore.sh b/restore.sh index e0b9cefb..a44a80b8 100755 --- a/restore.sh +++ b/restore.sh @@ -182,13 +182,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 -# redis configuration -sudo gzip -dkc ${tmp_dir}/redis/appendonly.aof.gz | sudo tee /var/lib/redis/appendonly.aof > /dev/null -sudo redis-check-aof --fix /var/lib/redis/appendonly.aof - -sudo redis-cli config set appendonly yes -sudo redis-cli config rewrite - print_green 'Installing postgresql' echo "$postgresql_repo" | sudo tee /etc/apt/sources.list.d/pgdg.list