From d3ca5453b868f1ea4a83c0cc419270b12a11a404 Mon Sep 17 00:00:00 2001
From: Kamil118 <Kamil1mld@gmail.com>
Date: Sun, 25 Oct 2026 21:34:40 +0000
Subject: [PATCH] updates after black october

---
 backup.sh                | 13 ++++++++++---
 gitea/compose.yaml       |  2 +-
 nextcloud/Dockerfile     |  4 ++--
 nextcloud/compose.yaml   | 18 +++++++++++++++++-
 picoshare/compose.yaml   |  5 +++++
 uptime-kuma/Dockerfile   |  4 ++++
 uptime-kuma/compose.yaml |  5 ++++-
 wireguard/compose.yaml   |  5 +++++
 8 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 uptime-kuma/Dockerfile

diff --git a/backup.sh b/backup.sh
index c3a2d05..cabb009 100755
--- a/backup.sh
+++ b/backup.sh
@@ -3,6 +3,8 @@
 exec 9> /home/debian/backup.lock
 flock -n 9 || exit 1
 
+nextcloud_disabled = 0
+
 set -e
 
 # List all required tools
@@ -21,7 +23,10 @@ mkdir -p postgres_backup
 cleanup_services() {
     echo "Resuming normal operations..."
     # Disable Nextcloud maintenance mode
-    docker exec -u www-data nextcloud_app php occ maintenance:mode --off || true
+
+    if [nextcloud_disabled -eq 1] then
+      docker exec -u www-data nextcloud_app php occ maintenance:mode --off || true
+    fi
     # Start all services back up (using start instead of stop)
     docker start gitea jellyfin synapse-foxgirls || true
 
@@ -31,7 +36,9 @@ cleanup_services() {
 trap cleanup_services EXIT INT TERM
 
 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
 
 
@@ -114,7 +121,7 @@ rclone delete "${BACKUP_REMOTE}" --min-age 60d --rmdirs --log-file="$HOME/backup
 
 echo "Backup Complete"
 
-wget -q -O /dev/null "${MONITORURL}" || true
+curl -s -o /dev/null "${MONITORURL}" || true
 
 #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 -
\ No newline at end of file
diff --git a/gitea/compose.yaml b/gitea/compose.yaml
index 8c2520f..71998dd 100644
--- a/gitea/compose.yaml
+++ b/gitea/compose.yaml
@@ -1,7 +1,7 @@
 
 services:
   server:
-    image: docker.gitea.com/gitea:1.27.0
+    image: docker.gitea.com/gitea:latest
     container_name: gitea
     restart: unless-stopped
 
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index 49f0e9f..9679f3a 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -1,5 +1,5 @@
-FROM nextcloud:34.0.1-apache
+FROM nextcloud:35.0.2-apache
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends ffmpeg && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/*
\ No newline at end of file
diff --git a/nextcloud/compose.yaml b/nextcloud/compose.yaml
index d364e3c..1bfe862 100644
--- a/nextcloud/compose.yaml
+++ b/nextcloud/compose.yaml
@@ -1,6 +1,7 @@
 
 services:
   nextcloud-app:
+    #image: nextcloud:35.0.2-apache
     build: .
     image: local-nextcloud
     container_name: nextcloud_app
@@ -39,6 +40,11 @@ services:
       timeout: 5s
       retries: 3
       start_period: 10s
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
 
   nextcloud-redis:
     image: redis:alpine # Essential for file locking, uses almost no RAM (~20MB)
@@ -53,10 +59,15 @@ services:
       timeout: 5s
       retries: 3
       start_period: 5s
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
 
   nextcloud-cron:
-    build: .
     image: local-nextcloud
+    build: .
     container_name: nextcloud_cron
     restart: unless-stopped
     volumes:
@@ -73,6 +84,11 @@ services:
       timeout: 15s
       retries: 3
       start_period: 2m
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
 
 
 
diff --git a/picoshare/compose.yaml b/picoshare/compose.yaml
index 52c09ce..e3ab368 100644
--- a/picoshare/compose.yaml
+++ b/picoshare/compose.yaml
@@ -9,6 +9,11 @@ services:
     container_name: picoshare
     networks:
       - reverse_proxy_default
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
 networks:
   reverse_proxy_default:
     external: true
diff --git a/uptime-kuma/Dockerfile b/uptime-kuma/Dockerfile
new file mode 100644
index 0000000..f207814
--- /dev/null
+++ b/uptime-kuma/Dockerfile
@@ -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
\ No newline at end of file
diff --git a/uptime-kuma/compose.yaml b/uptime-kuma/compose.yaml
index c5f3ad7..79e04a4 100644
--- a/uptime-kuma/compose.yaml
+++ b/uptime-kuma/compose.yaml
@@ -1,6 +1,9 @@
 services:
   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
     container_name: uptime-kuma
     volumes:
diff --git a/wireguard/compose.yaml b/wireguard/compose.yaml
index 0fff563..744b03b 100644
--- a/wireguard/compose.yaml
+++ b/wireguard/compose.yaml
@@ -25,3 +25,8 @@ services:
     networks:
       - VPN
     restart: unless-stopped
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"