From a3130c12dd3ff087e9b3bda3c3dc6b619ec1f674 Mon Sep 17 00:00:00 2001
From: Eduardo Silva <eduardo@eth0.com.br>
Date: Sat, 22 Feb 2025 09:14:59 -0300
Subject: [PATCH] Update Docker files and add timezone support

---
 docker-compose-build.yml                      |  6 +++++
 docker-compose-no-nginx.yml                   | 21 ++++++++++++++++-
 docker-compose.yml                            | 23 ++++++++++++++++++-
 .../wireguard/wireguard_manage_peer.html      |  1 +
 wireguard_webadmin/settings.py                |  2 +-
 5 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/docker-compose-build.yml b/docker-compose-build.yml
index 66ce72c..68e3497 100644
--- a/docker-compose-build.yml
+++ b/docker-compose-build.yml
@@ -22,3 +22,9 @@ services:
     build:
       context: .
       dockerfile: Dockerfile_nginx
+
+  wireguard-webadmin-rrdtool:
+    image: eduardosilva/wireguard_webadmin_rrdtool:latest
+    build:
+      context: ./containers/rrdtool
+      dockerfile: Dockerfile-rrdtool
\ No newline at end of file
diff --git a/docker-compose-no-nginx.yml b/docker-compose-no-nginx.yml
index a79a011..631fdba 100644
--- a/docker-compose-no-nginx.yml
+++ b/docker-compose-no-nginx.yml
@@ -7,11 +7,14 @@ services:
     environment:
       - SERVER_ADDRESS=127.0.0.1
       - DEBUG_MODE=True
-      - COMPOSE_VERSION=02b
+      - COMPOSE_VERSION=02r
+      - TZ=${TIMEZONE}
     volumes:
       - wireguard:/etc/wireguard
       - static_volume:/app_static_files/
       - dnsmasq_conf:/etc/dnsmasq
+      - app_secrets:/app_secrets/
+      - rrd_data:/rrd_data/
     ports:
       # Do not directly expose the Django port to the internet, use some kind of reverse proxy with SSL.
       - "127.0.0.1:8000:8000"
@@ -32,6 +35,20 @@ services:
     container_name: wireguard-webadmin-cron
     restart: unless-stopped
     image: eduardosilva/wireguard_webadmin_cron:latest
+    environment:
+      - TZ=${TIMEZONE}
+    depends_on:
+      - wireguard-webadmin
+
+  wireguard-webadmin-rrdtool:
+    container_name: wireguard-webadmin-rrdtool
+    restart: unless-stopped
+    image: eduardosilva/wireguard_webadmin_rrdtool:latest
+    volumes:
+      - app_secrets:/app_secrets/
+      - rrd_data:/rrd_data/
+    environment:
+      - TZ=${TIMEZONE}
     depends_on:
       - wireguard-webadmin
 
@@ -39,6 +56,8 @@ services:
     container_name: wireguard-webadmin-dns
     restart: unless-stopped
     image: eduardosilva/wireguard_webadmin_dns:latest
+    environment:
+      - TZ=${TIMEZONE}
     volumes:
       - dnsmasq_conf:/etc/dnsmasq/
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 03ea77b..cd0e678 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,11 +7,14 @@ services:
     environment:
       - SERVER_ADDRESS=${SERVER_ADDRESS}
       - DEBUG_MODE=${DEBUG_MODE}
-      - COMPOSE_VERSION=02b
+      - COMPOSE_VERSION=02r
+      - TZ=${TIMEZONE}
     volumes:
       - wireguard:/etc/wireguard
       - static_volume:/app_static_files/
       - dnsmasq_conf:/etc/dnsmasq
+      - app_secrets:/app_secrets/
+      - rrd_data:/rrd_data/
     ports:
       # Do not directly expose the Django port to the internet, use the reverse proxy below instead
       # - "127.0.0.1:8000:8000"
@@ -32,6 +35,20 @@ services:
     container_name: wireguard-webadmin-cron
     restart: unless-stopped
     image: eduardosilva/wireguard_webadmin_cron:latest
+    environment:
+      - TZ=${TIMEZONE}
+    depends_on:
+      - wireguard-webadmin
+
+  wireguard-webadmin-rrdtool:
+    container_name: wireguard-webadmin-rrdtool
+    restart: unless-stopped
+    image: eduardosilva/wireguard_webadmin_rrdtool:latest
+    volumes:
+      - app_secrets:/app_secrets/
+      - rrd_data:/rrd_data/
+    environment:
+      - TZ=${TIMEZONE}
     depends_on:
       - wireguard-webadmin
 
@@ -39,6 +56,8 @@ services:
     container_name: wireguard-webadmin-dns
     restart: unless-stopped
     image: eduardosilva/wireguard_webadmin_dns:latest
+    environment:
+      - TZ=${TIMEZONE}
     volumes:
       - dnsmasq_conf:/etc/dnsmasq/
 
@@ -49,6 +68,8 @@ services:
     volumes:
       - static_volume:/static
       - https_cert:/certificate
+    environment:
+      - TZ=${TIMEZONE}
     ports:
       - "80:80"
       - "443:443"
diff --git a/templates/wireguard/wireguard_manage_peer.html b/templates/wireguard/wireguard_manage_peer.html
index fc3b2ef..b070866 100644
--- a/templates/wireguard/wireguard_manage_peer.html
+++ b/templates/wireguard/wireguard_manage_peer.html
@@ -59,6 +59,7 @@
                                 <a href="#" data-period="1h" class="btn btn-outline-primary btn-xs">1h</a>
                                 <a href="#" data-period="3h" class="btn btn-outline-primary btn-xs">3h</a>
                                 <a href="#" data-period="6h" class="btn btn-outline-primary btn-xs">6h</a>
+                                <a href="#" data-period="1d" class="btn btn-outline-primary btn-xs">1d</a>
                                 <a href="#" data-period="7d" class="btn btn-outline-primary btn-xs">7d</a>
                                 <a href="#" data-period="30d" class="btn btn-outline-primary btn-xs">1m</a>
                                 <a href="#" data-period="90d" class="btn btn-outline-primary btn-xs">3m</a>
diff --git a/wireguard_webadmin/settings.py b/wireguard_webadmin/settings.py
index 87dea26..bc472c1 100644
--- a/wireguard_webadmin/settings.py
+++ b/wireguard_webadmin/settings.py
@@ -134,6 +134,6 @@ STATICFILES_DIRS = [
 DNS_CONFIG_FILE = '/etc/dnsmasq/wireguard_webadmin_dns.conf'
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
-WIREGUARD_WEBADMIN_VERSION = 9702
+WIREGUARD_WEBADMIN_VERSION = 9901
 
 from wireguard_webadmin.production_settings import *