From 1de6a913a9b7d38338989a20e76d040c84fa626b Mon Sep 17 00:00:00 2001
From: BhasherBEL <github.it@bhasher.com>
Date: Tue, 23 May 2023 14:09:32 +0200
Subject: [PATCH] Dashy custom & borg service

---
 bxl-rpi/apps/docker-compose.dashy.yaml     |  3 ++-
 bxl-rpi/apps/docker-compose.tg2.yaml       |  9 +++++++++
 bxl-rpi/apps/docker-compose.wireguard.yaml |  2 +-
 bxl-rpi/config/borg/borg.service           | 14 ++++++++++++++
 bxl-rpi/config/borg/borg.timer             |  9 +++++++++
 bxl-rpi/config/dashy/config.yml            | 22 +++++-----------------
 6 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 bxl-rpi/config/borg/borg.service
 create mode 100644 bxl-rpi/config/borg/borg.timer

diff --git a/bxl-rpi/apps/docker-compose.dashy.yaml b/bxl-rpi/apps/docker-compose.dashy.yaml
index 773aaef..3d27a2a 100644
--- a/bxl-rpi/apps/docker-compose.dashy.yaml
+++ b/bxl-rpi/apps/docker-compose.dashy.yaml
@@ -1,7 +1,7 @@
 services:
   dashy:
     container_name: dashy
-    image: lissy93/dashy
+    image: dashy
     environment:
     - NODE_ENV=production
     restart: unless-stopped
@@ -15,6 +15,7 @@ services:
     - "traefik.http.routers.dashy.tls=true"
     - "traefik.http.routers.dashy.tls.certresolver=http"
     - "traefik.http.routers.dashy.middlewares=authelia@docker"
+    - "com.centurylinklabs.watchtower.enable=false"
     healthcheck:
       test: ['CMD', 'node', '/app/services/healthcheck']
       interval: 1m30s
diff --git a/bxl-rpi/apps/docker-compose.tg2.yaml b/bxl-rpi/apps/docker-compose.tg2.yaml
index 332da74..8e3ad43 100644
--- a/bxl-rpi/apps/docker-compose.tg2.yaml
+++ b/bxl-rpi/apps/docker-compose.tg2.yaml
@@ -2,3 +2,12 @@ services:
   tg2:
     container_name: tg2
     image: tg2:latest
+    environment:
+    - TGTG_EMAIL=tgtg.trash@bhasher.com
+    - TELEGRAM_TOKEN=${TELEGRAM_TOKEN}
+    - TELEGRAM_ID=${TELEGRAM_ID}
+    volumes:
+    - $DATA/tg2:/data
+    labels:
+    - "com.centurylinklabs.watchtower.enable=false"
+
diff --git a/bxl-rpi/apps/docker-compose.wireguard.yaml b/bxl-rpi/apps/docker-compose.wireguard.yaml
index c951214..c4a444a 100644
--- a/bxl-rpi/apps/docker-compose.wireguard.yaml
+++ b/bxl-rpi/apps/docker-compose.wireguard.yaml
@@ -12,7 +12,7 @@ services:
     - TZ=Europe/Paris
     - SERVERURL=vpn.bhasher.com
     - SERVERPORT=51821
-    - PEERS=5
+    - PEERS=10
     - PEERDNS=auto
     - INTERNAL_SUBNET=10.13.14.0
     - ALLOWEDIPS=0.0.0.0/0
diff --git a/bxl-rpi/config/borg/borg.service b/bxl-rpi/config/borg/borg.service
new file mode 100644
index 0000000..0d9d71b
--- /dev/null
+++ b/bxl-rpi/config/borg/borg.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Start Borg Backup Container
+After=docker.service
+ConditionPathExists=/mnt/borg
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/docker start borg
+User=pi
+Group=pi
+Restart=no
+
+[Install]
+WantedBy=multi-user.target
diff --git a/bxl-rpi/config/borg/borg.timer b/bxl-rpi/config/borg/borg.timer
new file mode 100644
index 0000000..17763b3
--- /dev/null
+++ b/bxl-rpi/config/borg/borg.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Run Borg Backup at 4 a.m. every day
+
+[Timer]
+OnCalendar=*-*-* 04:00:00
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff --git a/bxl-rpi/config/dashy/config.yml b/bxl-rpi/config/dashy/config.yml
index 3dc2a48..b45d7ce 100644
--- a/bxl-rpi/config/dashy/config.yml
+++ b/bxl-rpi/config/dashy/config.yml
@@ -171,7 +171,8 @@ sections:
         options:
           country: BE
           holidayType: all
-          monthsToShow: 12
+          monthsToShow: 4
+          lang: fr
         id: 1_1554_publicholidays
     displayData:
       sortBy: default
@@ -193,7 +194,7 @@ sections:
         options:
           username: BhasherBEL
           hideLanguagesCard: true
-        id: 2_1554_githubprofilestats
+        id: 1_1331_githubprofilestats
       - type: crypto-watch-list
         options:
           currency: USD
@@ -201,20 +202,7 @@ sections:
           assets:
             - bitcoin
             - ethereum
-        id: 1_1331_cryptowatchlist
-  - name: Monitoring
-    widgets:
-      - type: pi-hole-stats
-        options:
-          hostname: http://pihole/admin/api.php
-          apiKey: ''
-        id: 0_1062_piholestats
-    displayData:
-      sortBy: default
-      rows: 1
-      cols: 2
-      collapsed: false
-      hideForGuests: false
+        id: 2_1331_cryptowatchlist
   - name: Random
     widgets:
       - type: joke
@@ -229,6 +217,6 @@ sections:
     displayData:
       sortBy: default
       rows: 1
-      cols: 2
+      cols: 4
       collapsed: false
       hideForGuests: false