update gitignore

.gitignore

@@ -77,7 +77,8 @@ radarr/MediaCover/
 radarr/Sentry/
 radarr/asp/
 radarr/xdg/
-rsnapshot/var/
+rsnapshot/default.conf
+rsnapshot/rsnapshot.conf
 seafile/database/
 seafile/server/
 sonarr/Backups/
@@ -86,5 +87,6 @@ sonarr/Sentry/
 sonarr/asp/
 sonarr/xdg/
 transmission/settings.json
+transmission/stats.json
 transmission/etc/transmission/stats.json
 transmission/resume/

caddy/Caddyfile

@@ -50,4 +50,3 @@ import sites/ha.caddy
 import sites/geo.caddy
 import sites/auth.caddy
 import sites/test.caddy
-

collectd/Dockerfile

@@ -40,4 +40,8 @@ RUN echo 'collectd ALL=(ALL) NOPASSWD:ALL' | sudo tee /etc/sudoers.d/collectd
 RUN apt install -y --no-install-recommends python3-pip
 RUN pip install --break-system-packages requests
 
+RUN wget https://github.com/nickbabcock/pg-collectd/releases/download/v0.2.0/pg-collectd-collectd57_0.2.0_amd64.deb
+RUN dpkg -i pg-collectd-collectd57_0.2.0_amd64.deb
+RUN rm pg-collectd-collectd57_0.2.0_amd64.deb
+
 CMD ["/usr/sbin/collectd", "-f"]

collectd/etc/collectd.conf

@@ -16,7 +16,7 @@ Hostname "shuttle"
 FQDNLookup true
 #BaseDir "/var/lib/collectd"
 #PluginDir "/usr/lib/collectd"
-#TypesDB "/usr/share/collectd/types.db" "/etc/collectd/my_types.db" 
+#TypesDB "/usr/share/collectd/types.db" "/etc/collectd/my_types.db"
 #----------------------------------------------------------------------------#
 # When enabled, plugins are loaded automatically with the default options    #
 # when an appropriate <Plugin ...> block is encountered.                     #
@@ -83,6 +83,7 @@ LoadPlugin swap
 LoadPlugin uptime
 LoadPlugin users
 LoadPlugin smart
+LoadPlugin pg_collectd
 
 ##############################################################################
 # Plugin configuration                                                       #
@@ -111,7 +112,7 @@ LoadPlugin smart
 <Plugin disk>
     Disk "sda"
     Disk "sdb"
-    Disk "nvme0"
+    Disk "nvme0n1"
     IgnoreSelected false
 </Plugin>
 
@@ -123,10 +124,17 @@ LoadPlugin smart
 <Plugin "smart">
     Disk "sda"
     Disk "sdb"
-    Disk "nvme0"
+    Disk "nvme0n1"
     IgnoreSelected false
 </Plugin>
 
+<Plugin pg_collectd>
+    BatchSize 1000
+    Connection "postgresql://collectd:collectd@host:6543/collectd"
+    StoreRates true
+    LogTimings INFO
+</Plugin>
+
 <Include "/etc/collectd/collectd.conf.d">
 	Filter "*.conf"
 </Include>

collectd/usr/local/bin/speedtest-data

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SPEEDTEST=/usr/bin/speedtest-cli
+SPEEDTEST="/usr/bin/speedtest-cli --secure"
 COLLECTION=shuttle
 INTERVAL=900
 
@@ -8,8 +8,6 @@ while :; do
     SECONDS=0
     RESULT=($($SPEEDTEST | grep Mbit | cut -d' ' -f 2))
     TIMESTAMP=$(date +%s)
-    #echo "PUTVAL $COLLECTION/exec-speedtest/gauge-download interval=$INTERVAL N:${RESULT[0]}"
-    #echo "PUTVAL $COLLECTION/exec-speedtest/gauge-upload interval=$INTERVAL N:${RESULT[1]}"
     echo "PUTVAL $COLLECTION/exec-speedtest/gauge-download ${TIMESTAMP}:${RESULT[0]}"
     echo "PUTVAL $COLLECTION/exec-speedtest/gauge-upload ${TIMESTAMP}:${RESULT[1]}"
     sleep $((INTERVAL-$SECONDS))

dns-ad-blocker/run

@@ -2,5 +2,5 @@
 
 echo "Starting dnsmasq..."
 # Running dnsmasq as root prevents needing to run the entire container with --cap-add=NET_ADMIN
-#dnsmasq --user=root --keep-in-foreground --log-facility=/dev/stdout
+dnsmasq --user=root --keep-in-foreground --log-facility=/dev/stdout
-dnsmasq --log-queries --user=root --keep-in-foreground --log-facility=/var/log/dnsmasq.log --addn-hosts=/etc/dnsmasq.hosts
+#dnsmasq --log-queries --user=root --keep-in-foreground --log-facility=/var/log/dnsmasq.log --addn-hosts=/etc/dnsmasq.hosts

docker-compose.autoheal.yaml

@@ -0,0 +1,8 @@
+services:
+    autoheal:
+        image: willfarrell/autoheal:1.2.0
+        container_name: autoheal
+        volumes:
+        - /var/run/docker.sock:/var/run/docker.sock
+        environment:
+        - AUTOHEAL_CONTAINER_LABEL=all

docker-compose.collectd.yaml

@@ -15,3 +15,5 @@ services:
     - /media/data:/media/data:ro
     - /var/lib/docker:/media/docker:ro
     - /dev/mapper:/dev/mapper
+    extra_hosts:
+    - host:192.168.2.200

docker-compose.dsmr.yaml

@@ -5,8 +5,8 @@ services:
         - dsmrdb
         - influxdb
         environment:
-        - DSMRREADER_ADMIN_USER="${DSMRREADER_USER:?}"
+        - DSMRREADER_ADMIN_USER=${DSMRREADER_USER:?}
-        - DSMRREADER_ADMIN_PASSWORD="${DSMRREADER_PASSWORD:?}"
+        - DSMRREADER_ADMIN_PASSWORD=${DSMRREADER_PASSWORD:?}
         image: xirixiz/dsmr-reader-docker:5.10.3-2023.04.02
         links:
         - dsmrdb:dsmrreader
@@ -18,9 +18,9 @@ services:
     dsmrdb:
         container_name: dsmrdb
         environment:
-        - POSTGRES_DB="${DSMRDB_DATABASE:?}"
+        - POSTGRES_DB=${DSMRDB_DATABASE:?}
-        - POSTGRES_USER="${DSMRDB_USER:?}"
+        - POSTGRES_USER=${DSMRDB_USER:?}
-        - POSTGRES_PASSWORD="${DSMRDB_PASSWORD:?}"
+        - POSTGRES_PASSWORD=${DSMRDB_PASSWORD:?}
         image: postgres:13.7
         ports:
         - 5432:5432

docker-compose.homeassistant.yaml

@@ -1,7 +1,7 @@
 services:
     homeassistant:
         container_name: homeassistant
-        image: homeassistant/home-assistant:2024.11
+        image: homeassistant/home-assistant:2025.1.2
         network_mode: host
         privileged: true
         restart: unless-stopped

docker-compose.rsnapshot.yaml

@@ -4,10 +4,6 @@ services:
         image: linuxserver/rsnapshot:1.4.5
         restart: unless-stopped
         volumes:
-        - /opt/rsnapshot/etc:/etc/rsnapshot
+        - /opt/rsnapshot:/config
-        - /opt/rsnapshot/var/log:/var/log
-        - /opt/rsnapshot/var/run:/var/run
-        - /opt/rsnapshot/var/spool:/var/spool
-        - /opt/rsnapshot/usr:/host/usr
         - /mnt/yotta/xenon/rsnapshot:/host/scratch
         - /root/.ssh:/root/.ssh:ro

docker-compose.socks.yaml

@@ -0,0 +1,8 @@
+services:
+    socks:
+        container_name: socks
+        image: serjs/go-socks5-proxy 
+        ports:
+        - 1081:1080
+        network_mode: service:surfshark
+        restart: unless-stopped

docker-compose.sonarr.yaml

@@ -1,6 +1,6 @@
 services:
     sonarr:
-        image: linuxserver/sonarr:4.0.10
+        image: linuxserver/sonarr:4.0.14
         container_name: sonarr
         environment:
         - PUID=1000

docker-compose.surfshark.yaml

@@ -14,6 +14,7 @@ services:
         - SURFSHARK_CITY=ams
         - CONNECTION_TYPE=udp
         - LAN_NETWORK=
+        - ENABLE_SOCKS_SERVER=true
         image: ilteoood/docker-surfshark:1.7.2
         ports:
         - 1080:1080
@@ -22,3 +23,5 @@ services:
         - 6881:6881
         - 6881:6881/udp
         restart: unless-stopped
+        labels:
+        - autoheal=true 

docker-compose.timescaledb.yaml

@@ -2,11 +2,12 @@ services:
     timescaledb:
         container_name: timescaledb
         environment:
-        - POSTGRES_USER="${TIMESCALEDB_USER:?}"
+        - POSTGRES_USER=${TIMESCALEDB_USER:?}
-        - POSTGRES_PASSWORD="${TIMESCALEDB_PASSWORD:?}"
+        - POSTGRES_PASSWORD=${TIMESCALEDB_PASSWORD:?}
-        image: timescale/timescaledb:2.7.1-pg14
+        image: timescale/timescaledb:2.17.2-pg17
         ports:
         - 6543:5432
         restart: unless-stopped
         volumes:
         - /mnt/mezzo/scratch/timescaledb:/var/lib/postgresql/data
+

docker-compose.yaml

@@ -6,6 +6,7 @@ include:
 - docker-compose.authentik.yaml
 
 # Other
+- docker-compose.autoheal.yaml
 - docker-compose.collectd.yaml
 - docker-compose.homarr.yaml
 - docker-compose.homeassistant.yaml
@@ -27,6 +28,7 @@ include:
 # Networking
 - docker-compose.surfshark.yaml
 - docker-compose.dns-ad-blocker.yaml
+#- docker-compose.socks.yaml
 # - docker-compose.openvpn-server.yaml
 
 # Backup

homeassistant/automations.yaml

@@ -38,46 +38,7 @@
     target:
       area_id: living_room
   mode: single
-- id: '1734944700393'
-  alias: Tag Tesla Trunk is scanned
-  description: ''
-  triggers:
-  - trigger: tag
-    tag_id: b29e4222-0bcf-45a8-b321-44d8e3843ab1
-  conditions: []
-  actions:
-  - device_id: 43d01fc532f3381528be6e668b0e0f0e
-    domain: cover
-    entity_id: e4a7e22a6eae2b28790819307a1bad66
-    type: open
-  mode: single
 - id: '1735038229663'
-  alias: Tag Tesla Trunk is scanned
-  description: ''
-  triggers:
-  - trigger: tag
-    tag_id: b29e4222-0bcf-45a8-b321-44d8e3843ab1
-  conditions: []
-  actions:
-  - device_id: 43d01fc532f3381528be6e668b0e0f0e
-    domain: cover
-    entity_id: c7be36d71c1d77e081ad418b85953f31
-    type: open
-  mode: single
-- id: '1735038265013'
-  alias: Tag Tesla Trunk is scanned
-  description: ''
-  triggers:
-  - trigger: tag
-    tag_id: b29e4222-0bcf-45a8-b321-44d8e3843ab1
-  conditions: []
-  actions:
-  - device_id: 43d01fc532f3381528be6e668b0e0f0e
-    domain: cover
-    entity_id: e4a7e22a6eae2b28790819307a1bad66
-    type: open
-  mode: single
-- id: '1735038299939'
   alias: Tag Tesla Trunk is scanned
   description: ''
   triggers:

rsnapshot/common.conf

@@ -14,4 +14,4 @@ link_dest	1
 
 stop_on_stale_lockfile	0
 
-exclude	*.snapshot
+exclude	*.snapshot

rsnapshot/docker.conf

@@ -0,0 +1,11 @@
+include_conf	/config/common.conf
+
+logfile		/host/scratch/docker.log
+lockfile	/host/scratch/docker.pid
+
+snapshot_root	/host/scratch/docker
+
+backup	root@shuttle:/opt	shuttle
+backup	root@sepia:/opt		sepia
+backup	root@server:/opt	server
+

rsnapshot/etc/default.conf

@@ -1,254 +0,0 @@
-#################################################
-# rsnapshot.conf - rsnapshot configuration file #
-#################################################
-#                                               #
-# PLEASE BE AWARE OF THE FOLLOWING RULES:       #
-#                                               #
-# This file requires tabs between elements      #
-#                                               #
-# Directories require a trailing slash:         #
-#   right: /home/                               #
-#   wrong: /home                                #
-#                                               #
-#################################################
-
-#######################
-# CONFIG FILE VERSION #
-#######################
-
-config_version	1.2
-
-###########################
-# SNAPSHOT ROOT DIRECTORY #
-###########################
-
-# All snapshots will be stored under this root directory.
-#
-snapshot_root	/var/cache/rsnapshot/
-
-# If no_create_root is enabled, rsnapshot will not automatically create the
-# snapshot_root directory. This is particularly useful if you are backing
-# up to removable media, such as a FireWire or USB drive.
-#
-#no_create_root	1
-
-#################################
-# EXTERNAL PROGRAM DEPENDENCIES #
-#################################
-
-# LINUX USERS:   Be sure to uncomment "cmd_cp". This gives you extra features.
-# EVERYONE ELSE: Leave "cmd_cp" commented out for compatibility.
-#
-# See the README file or the man page for more details.
-#
-cmd_cp		/bin/cp
-
-# uncomment this to use the rm program instead of the built-in perl routine.
-#
-cmd_rm		/bin/rm
-
-# rsync must be enabled for anything to work. This is the only command that
-# must be enabled.
-#
-cmd_rsync	/usr/bin/rsync
-
-# Uncomment this to enable remote ssh backups over rsync.
-#
-#cmd_ssh	/usr/bin/ssh
-
-# Comment this out to disable syslog support.
-#
-cmd_logger	/usr/bin/logger
-
-# Uncomment this to specify the path to "du" for disk usage checks.
-# If you have an older version of "du", you may also want to check the
-# "du_args" parameter below.
-#
-#cmd_du		/usr/bin/du
-
-# Uncomment this to specify the path to rsnapshot-diff.
-#
-#cmd_rsnapshot_diff	/usr/bin/rsnapshot-diff
-
-# Specify the path to a script (and any optional arguments) to run right
-# before rsnapshot syncs files
-#
-#cmd_preexec	/path/to/preexec/script
-
-# Specify the path to a script (and any optional arguments) to run right
-# after rsnapshot syncs files
-#
-#cmd_postexec	/path/to/postexec/script
-
-# Paths to lvcreate, lvremove, mount and umount commands, for use with
-# Linux LVMs.
-#
-#linux_lvm_cmd_lvcreate	/sbin/lvcreate
-#linux_lvm_cmd_lvremove	/sbin/lvremove
-#linux_lvm_cmd_mount	/bin/mount
-#linux_lvm_cmd_umount	/bin/umount
-
-#########################################
-#           BACKUP INTERVALS            #
-# Must be unique and in ascending order #
-# i.e. hourly, daily, weekly, etc.      #
-#########################################
-
-retain		hourly	6
-retain		daily	7
-retain		weekly	4
-#retain	monthly	3
-
-############################################
-#              GLOBAL OPTIONS              #
-# All are optional, with sensible defaults #
-############################################
-
-# Verbose level, 1 through 5.
-# 1     Quiet           Print fatal errors only
-# 2     Default         Print errors and warnings only
-# 3     Verbose         Show equivalent shell commands being executed
-# 4     Extra Verbose   Show extra verbose information
-# 5     Debug mode      Everything
-#
-verbose		2
-
-# Same as "verbose" above, but controls the amount of data sent to the
-# logfile, if one is being used. The default is 3.
-#
-loglevel	3
-
-# If you enable this, data will be written to the file you specify. The
-# amount of data written is controlled by the "loglevel" parameter.
-#
-#logfile	/var/log/rsnapshot.log
-
-# If enabled, rsnapshot will write a lockfile to prevent two instances
-# from running simultaneously (and messing up the snapshot_root).
-# If you enable this, make sure the lockfile directory is not world
-# writable. Otherwise anyone can prevent the program from running.
-#
-lockfile	/var/run/rsnapshot.pid
-
-# By default, rsnapshot check lockfile, check if PID is running
-# and if not, consider lockfile as stale, then start
-# Enabling this stop rsnapshot if PID in lockfile is not running
-#
-#stop_on_stale_lockfile		0
-
-# Default rsync args. All rsync commands have at least these options set.
-#
-#rsync_short_args	-a
-#rsync_long_args	--delete --numeric-ids --relative --delete-excluded
-
-# ssh has no args passed by default, but you can specify some here.
-#
-#ssh_args	-p 22
-
-# Default arguments for the "du" program (for disk space reporting).
-# The GNU version of "du" is preferred. See the man page for more details.
-# If your version of "du" doesn't support the -h flag, try -k flag instead.
-#
-#du_args	-csh
-
-# If this is enabled, rsync won't span filesystem partitions within a
-# backup point. This essentially passes the -x option to rsync.
-# The default is 0 (off).
-#
-#one_fs		0
-
-# The include and exclude parameters, if enabled, simply get passed directly
-# to rsync. If you have multiple include/exclude patterns, put each one on a
-# separate line. Please look up the --include and --exclude options in the
-# rsync man page for more details on how to specify file name patterns. 
-# 
-#include	???
-#include	???
-#exclude	???
-#exclude	???
-
-# The include_file and exclude_file parameters, if enabled, simply get
-# passed directly to rsync. Please look up the --include-from and
-# --exclude-from options in the rsync man page for more details.
-#
-#include_file	/path/to/include/file
-#exclude_file	/path/to/exclude/file
-
-# If your version of rsync supports --link-dest, consider enable this.
-# This is the best way to support special files (FIFOs, etc) cross-platform.
-# The default is 0 (off).
-#
-#link_dest	0
-
-# When sync_first is enabled, it changes the default behaviour of rsnapshot.
-# Normally, when rsnapshot is called with its lowest interval
-# (i.e.: "rsnapshot hourly"), it will sync files AND rotate the lowest
-# intervals. With sync_first enabled, "rsnapshot sync" handles the file sync,
-# and all interval calls simply rotate files. See the man page for more
-# details. The default is 0 (off).
-#
-#sync_first	0
-
-# If enabled, rsnapshot will move the oldest directory for each interval
-# to [interval_name].delete, then it will remove the lockfile and delete
-# that directory just before it exits. The default is 0 (off).
-#
-#use_lazy_deletes	0
-
-# Number of rsync re-tries. If you experience any network problems or
-# network card issues that tend to cause ssh to crap-out with
-# "Corrupted MAC on input" errors, for example, set this to a non-zero
-# value to have the rsync operation re-tried
-#
-#rsync_numtries 0
-
-# LVM parameters. Used to backup with creating lvm snapshot before backup
-# and removing it after. This should ensure consistency of data in some special
-# cases
-#
-# LVM snapshot(s) size (lvcreate --size option).
-#
-#linux_lvm_snapshotsize	100M
-
-# Name to be used when creating the LVM logical volume snapshot(s).
-#
-#linux_lvm_snapshotname	rsnapshot
-
-# Path to the LVM Volume Groups.
-#
-#linux_lvm_vgpath	/dev
-
-# Mount point to use to temporarily mount the snapshot(s).
-#
-#linux_lvm_mountpath	/path/to/mount/lvm/snapshot/during/backup
-
-###############################
-### BACKUP POINTS / SCRIPTS ###
-###############################
-
-# LOCALHOST
-backup	/home/		localhost/
-backup	/etc/		localhost/
-backup	/usr/local/	localhost/
-#backup	/var/log/rsnapshot		localhost/
-#backup	/etc/passwd	localhost/
-#backup	/home/foo/My Documents/		localhost/
-#backup	/foo/bar/	localhost/	one_fs=1, rsync_short_args=-urltvpog
-#backup_script	/usr/local/bin/backup_pgsql.sh	localhost/postgres/
-# You must set linux_lvm_* parameters below before using lvm snapshots
-#backup	lvm://vg0/xen-home/	lvm-vg0/xen-home/
-
-# EXAMPLE.COM
-#backup_script	/bin/date "+ backup of example.com started at %c"	unused1
-#backup	root@example.com:/home/	example.com/	+rsync_long_args=--bwlimit=16,exclude=core
-#backup	root@example.com:/etc/	example.com/	exclude=mtab,exclude=core
-#backup_script	ssh root@example.com "mysqldump -A > /var/db/dump/mysql.sql"	unused2
-#backup	root@example.com:/var/db/dump/	example.com/
-#backup_script	/bin/date	"+ backup of example.com ended at %c"	unused9
-
-# CVS.SOURCEFORGE.NET
-#backup_script	/usr/local/bin/backup_rsnapshot_cvsroot.sh	rsnapshot.cvs.sourceforge.net/
-
-# RSYNC.SAMBA.ORG
-#backup	rsync://rsync.samba.org/rsyncftp/	rsync.samba.org/rsyncftp/
-

rsnapshot/etc/docker.conf

@@ -1,10 +0,0 @@
-include_conf	/etc/rsnapshot/common.conf
-
-logfile		/var/log/docker.log
-lockfile	/var/run/rsnapshot/docker.pid
-
-snapshot_root	/host/scratch/docker
-
-backup	root@shuttle:/opt	shuttle
-backup	root@sepia:/opt		sepia
-backup	root@server:/opt	server

rsnapshot/os.conf

@@ -1,7 +1,7 @@
-include_conf	/etc/rsnapshot/common.conf
+include_conf	/config/common.conf
 
-logfile		/var/log/os.log
+logfile		/host/scratch/os.log
-lockfile	/var/run/rsnapshot/os.pid
+lockfile	/host/scratch/os.pid
 
 snapshot_root	/host/scratch/os
 
@@ -35,3 +35,4 @@ exclude	/var/lib/docker
 exclude	/var/lib/mlocate
 exclude	/usr/lib/debug
 exclude	/usr/share/locale
+

rsnapshot/users.conf

@@ -1,7 +1,7 @@
-include_conf	/etc/rsnapshot/common.conf
+include_conf	/config/common.conf
 
-logfile		/var/log/users.log
+logfile		/host/scratch/users.log
-lockfile	/var/run/rsnapshot/users.pid
+lockfile	/host/scratch/users.pid
 
 snapshot_root	/host/scratch/users
 
@@ -12,4 +12,5 @@ backup	root@sepia:/home	sepia
 backup	root@sepia:/root	sepia
 
 backup	root@server:/home	server
-backup	root@server:/root	server
+backup	root@server:/root	server
+

rsnapshot/usr/local/bin/make-snapshot

@@ -1,2 +0,0 @@
-#! /bin/bash
-/bin/nice -n 19 /bin/ionice -c2 -n7 /usr/bin/rsnapshot -c /etc/rsnapshot/$1.conf $2

rsnapshot/usr/local/bin/merge-snaphosts

@@ -1,7 +0,0 @@
-#! /bin/bash
-DIR=/host/scratch
-echo $DIR
-# If the source and destination directories exist then perform the merge
-[ -d $DIR/$1/$2 ] && [ -d $DIR/$1/$3/ ] && \
-    /bin/cp -al $DIR/$1/$2/* $DIR/$1/$3/
- exit 0

rsnapshot/var/spool/cron/crontabs/root

@@ -1,9 +0,0 @@
-0 3 *  * *  /host/usr/local/bin/make-snapshot os     daily
-0 4 *  * 0  /host/usr/local/bin/make-snapshot os     weekly
-0 5 30 * *  /host/usr/local/bin/make-snapshot os     monthly
-0 3 *  * *  /host/usr/local/bin/make-snapshot docker daily
-0 4 *  * 0  /host/usr/local/bin/make-snapshot docker weekly
-0 5 30 * *  /host/usr/local/bin/make-snapshot docker monthly
-0 3 *  * *  /host/usr/local/bin/make-snapshot users  daily
-0 4 *  * 0  /host/usr/local/bin/make-snapshot users  weekly
-0 5 30 * *  /host/usr/local/bin/make-snapshot users  monthly

transmission/stats.json

@@ -1,7 +0,0 @@
-{
-    "downloaded-bytes": 925750661009,
-    "files-added": 24531,
-    "seconds-active": 49290627,
-    "session-count": 48,
-    "uploaded-bytes": 754451022137
-}