From a4d854837957f1c157d40f14a1140390df35f769 Mon Sep 17 00:00:00 2001
From: matthias <matthias.mitscherlich@gmail.com>
Date: Tue, 15 Aug 2023 16:59:30 +0000
Subject: [PATCH] added SWAG proxy manager Updated backup schedules removed
 loki from grafana

---
 compose/backup/docker-compose.yml         |  8 +++---
 compose/grafana/docker-compose.yml        | 16 +++++------
 compose/piholeexporter/docker-compose.yml | 21 ++++++++------
 compose/swag/docker-compose.yml           | 35 +++++++++++++++++++++++
 4 files changed, 59 insertions(+), 21 deletions(-)
 create mode 100644 compose/swag/docker-compose.yml

diff --git a/compose/backup/docker-compose.yml b/compose/backup/docker-compose.yml
index acc877e..2fa5886 100644
--- a/compose/backup/docker-compose.yml
+++ b/compose/backup/docker-compose.yml
@@ -35,7 +35,7 @@ services:
     image: registry.vbchaos.nl/rclone:arm64
     environment:
       - COMMAND=rclone copy -v /backup/ stackstorage:/maurice/dockerstorage
-      - CRON_SCHEDULE=0 0 * * *
+      - CRON_SCHEDULE=0 0-23/4 * * *
     configs:
       - source: stackstorage
         target: /config/rclone.conf
@@ -49,7 +49,7 @@ services:
     image: registry.vbchaos.nl/rclone:arm64
     environment:
       - COMMAND=rclone copy -v /backup/ stackstorage:/maurice/repositories
-      - CRON_SCHEDULE=0 1 * * *
+      - CRON_SCHEDULE=0 1-23/4 * * *
     configs:
       - source: stackstorage
         target: /config/rclone.conf
@@ -63,7 +63,7 @@ services:
     image: registry.vbchaos.nl/rclone:arm64
     environment:
       - COMMAND=rclone copy -v /backup/ stackstorage:/maurice/nextcloud
-      - CRON_SCHEDULE=0 2 * * *
+      - CRON_SCHEDULE=0 2-23/4 * * *
     configs:
       - source: stackstorage
         target: /config/rclone.conf
@@ -77,7 +77,7 @@ services:
     image: registry.vbchaos.nl/rclone:arm64
     environment:
       - COMMAND=rclone copy -v /backup/ stackstorage:/maurice/bands
-      - CRON_SCHEDULE=* 0 2 * * *
+      - CRON_SCHEDULE=0 3-23/4 * * *
     configs:
       - source: stackstorage
         target: /config/rclone.conf
diff --git a/compose/grafana/docker-compose.yml b/compose/grafana/docker-compose.yml
index 813b383..9c95719 100644
--- a/compose/grafana/docker-compose.yml
+++ b/compose/grafana/docker-compose.yml
@@ -28,14 +28,14 @@ configs:
 
 services:
 
-  loki:
-    image: grafana/loki:2.6.1
-    user: "0:0"
-    volumes:
-      - loki_data:/loki
-    ports:
-      - "3100:3100"
-    command: -config.file=/etc/loki/local-config.yaml
+#  loki:
+#    image: grafana/loki:2.6.1
+#    user: "0:0"
+#    volumes:
+#      - loki_data:/loki
+#    ports:
+#      - "3100:3100"
+#    command: -config.file=/etc/loki/local-config.yaml
 
   promtail:
     image: grafana/promtail:2.6.1
diff --git a/compose/piholeexporter/docker-compose.yml b/compose/piholeexporter/docker-compose.yml
index 3e0862c..cb5277c 100644
--- a/compose/piholeexporter/docker-compose.yml
+++ b/compose/piholeexporter/docker-compose.yml
@@ -1,14 +1,17 @@
 version: '3.3'
 
 services:
-
   pihole-exporter:
-    image: remiflandrois/pihole-exporter:latest
-    environment:
-        - PIHOLE_HOSTNAME=192.168.1.8
-        - PIHOLE_PASSWORD=14Mai1984
-        - INTERVAL=5s
-        - PORT=9617
+    image: ekofr/pihole-exporter:latest
+#    image: remiflandrois/pihole-exporter:latest
+    container_name: pihole_exporter
     ports:
-        - 9617:9617
-    restart: always
+      - 9617:9617
+    environment:
+      PIHOLE_HOSTNAME: 192.168.1.8
+      PIHOLE_PORT: 80
+      PIHOLE_PASSWORD: 14Mai1984 
+      INTERVAL: 5s
+      PORT: 9617
+
+
diff --git a/compose/swag/docker-compose.yml b/compose/swag/docker-compose.yml
new file mode 100644
index 0000000..8799ef5
--- /dev/null
+++ b/compose/swag/docker-compose.yml
@@ -0,0 +1,35 @@
+version: "3"
+
+volumes:
+  swag_data:
+    driver_opts:
+      type: nfs
+      o: addr=dockerstorage,nfsvers=4
+      device: :/dockerstorage/swag
+
+services:
+  swag:
+    image: lscr.io/linuxserver/swag:latest
+    container_name: swag
+    cap_add:
+      - NET_ADMIN
+    environment:
+      - PUID=1000
+      - PGID=100
+      - TZ=Etc/UTC
+      - URL=vbchaos.nl
+      - VALIDATION=http
+      - SUBDOMAINS=nc,git,grafana #optional
+      - CERTPROVIDER= #optional
+      - DNSPLUGIN=cloudflare #optional
+      - PROPAGATION= #optional
+      - EMAIL= matthias.mitscherlich@gmail.com
+      - ONLY_SUBDOMAINS=false #optional
+      - EXTRA_DOMAINS= #optional
+      - STAGING=false #optional
+    volumes:
+      - swag_data:/config
+    ports:
+      - 443:443
+      - 80:80 #optional
+    restart: unless-stopped