updates after black october
This commit is contained in:
1 parent
db197fe499
commit
d3ca5453b8
8 files changed
+46
-6
No files matched your search
@@ -3,6 +3,8 @@
|
|||||||
exec 9> /home/debian/backup.lock
|
exec 9> /home/debian/backup.lock
|
||||||
flock -n 9 || exit 1
|
flock -n 9 || exit 1
|
||||||
|
|
||||||
|
nextcloud_disabled = 0
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# List all required tools
|
# List all required tools
|
||||||
@@ -21,7 +23,10 @@ mkdir -p postgres_backup
|
|||||||
cleanup_services() {
|
cleanup_services() {
|
||||||
echo "Resuming normal operations..."
|
echo "Resuming normal operations..."
|
||||||
# Disable Nextcloud maintenance mode
|
# Disable Nextcloud maintenance mode
|
||||||
|
|
||||||
|
if [nextcloud_disabled -eq 1] then
|
||||||
docker exec -u www-data nextcloud_app php occ maintenance:mode --off || true
|
docker exec -u www-data nextcloud_app php occ maintenance:mode --off || true
|
||||||
|
fi
|
||||||
# Start all services back up (using start instead of stop)
|
# Start all services back up (using start instead of stop)
|
||||||
docker start gitea jellyfin synapse-foxgirls || true
|
docker start gitea jellyfin synapse-foxgirls || true
|
||||||
|
|
||||||
@@ -31,7 +36,9 @@ cleanup_services() {
|
|||||||
trap cleanup_services EXIT INT TERM
|
trap cleanup_services EXIT INT TERM
|
||||||
|
|
||||||
echo "Pausing services..."
|
echo "Pausing services..."
|
||||||
docker exec -u www-data nextcloud_app php occ maintenance:mode --on || true
|
if [nextcloud_disabled -eq 1] then
|
||||||
|
docker exec -u www-data nextcloud_app php occ maintenance:mode --on || true
|
||||||
|
fi
|
||||||
docker stop gitea jellyfin synapse-foxgirls || true
|
docker stop gitea jellyfin synapse-foxgirls || true
|
||||||
|
|
||||||
|
|
||||||
@@ -114,7 +121,7 @@ rclone delete "${BACKUP_REMOTE}" --min-age 60d --rmdirs --log-file="$HOME/backup
|
|||||||
|
|
||||||
echo "Backup Complete"
|
echo "Backup Complete"
|
||||||
|
|
||||||
wget -q -O /dev/null "${MONITORURL}" || true
|
curl -s -o /dev/null "${MONITORURL}" || true
|
||||||
|
|
||||||
#todo make something to test bakcups
|
#todo make something to test bakcups
|
||||||
#gpg --batch -d --passphrase "password_here" full_backup_2026-08-19_01-00.tar.xz.gpg | xz -d -T0 | tar xf -
|
#gpg --batch -d --passphrase "password_here" full_backup_2026-08-19_01-00.tar.xz.gpg | xz -d -T0 | tar xf -
|
||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
server:
|
server:
|
||||||
image: docker.gitea.com/gitea:1.27.0
|
image: docker.gitea.com/gitea:latest
|
||||||
container_name: gitea
|
container_name: gitea
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM nextcloud:34.0.1-apache
|
FROM nextcloud:35.0.2-apache
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y --no-install-recommends ffmpeg && \
|
apt-get install -y --no-install-recommends ffmpeg && \
|
||||||
|
|||||||
+17
-1
@@ -1,6 +1,7 @@
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
nextcloud-app:
|
nextcloud-app:
|
||||||
|
#image: nextcloud:35.0.2-apache
|
||||||
build: .
|
build: .
|
||||||
image: local-nextcloud
|
image: local-nextcloud
|
||||||
container_name: nextcloud_app
|
container_name: nextcloud_app
|
||||||
@@ -39,6 +40,11 @@ services:
|
|||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 3
|
retries: 3
|
||||||
start_period: 10s
|
start_period: 10s
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "10m"
|
||||||
|
max-file: "3"
|
||||||
|
|
||||||
nextcloud-redis:
|
nextcloud-redis:
|
||||||
image: redis:alpine # Essential for file locking, uses almost no RAM (~20MB)
|
image: redis:alpine # Essential for file locking, uses almost no RAM (~20MB)
|
||||||
@@ -53,10 +59,15 @@ services:
|
|||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 3
|
retries: 3
|
||||||
start_period: 5s
|
start_period: 5s
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "10m"
|
||||||
|
max-file: "3"
|
||||||
|
|
||||||
nextcloud-cron:
|
nextcloud-cron:
|
||||||
build: .
|
|
||||||
image: local-nextcloud
|
image: local-nextcloud
|
||||||
|
build: .
|
||||||
container_name: nextcloud_cron
|
container_name: nextcloud_cron
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
@@ -73,6 +84,11 @@ services:
|
|||||||
timeout: 15s
|
timeout: 15s
|
||||||
retries: 3
|
retries: 3
|
||||||
start_period: 2m
|
start_period: 2m
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "10m"
|
||||||
|
max-file: "3"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,11 @@ services:
|
|||||||
container_name: picoshare
|
container_name: picoshare
|
||||||
networks:
|
networks:
|
||||||
- reverse_proxy_default
|
- reverse_proxy_default
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "10m"
|
||||||
|
max-file: "3"
|
||||||
networks:
|
networks:
|
||||||
reverse_proxy_default:
|
reverse_proxy_default:
|
||||||
external: true
|
external: true
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
FROM louislam/uptime-kuma:2
|
||||||
|
RUN sudo npm cache clean -f
|
||||||
|
RUN sudo npm install -g n
|
||||||
|
RUN sudo n 22.23.4
|
||||||
@@ -1,6 +1,9 @@
|
|||||||
services:
|
services:
|
||||||
kuma:
|
kuma:
|
||||||
image: louislam/uptime-kuma:2
|
#rce mitigation, swap back to louislam/uptime-kuma:2 once it's updated
|
||||||
|
#image: louislam/uptime-kuma:2
|
||||||
|
image: local-kuma
|
||||||
|
build: .
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
container_name: uptime-kuma
|
container_name: uptime-kuma
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
@@ -25,3 +25,8 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- VPN
|
- VPN
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "10m"
|
||||||
|
max-file: "3"
|
||||||
Reference in new issue
Block a user