diff --git a/playbooks/backup/backupDaily.sh b/playbooks/backup/backupDaily.sh index 7eb9fc0..3d84bac 100644 --- a/playbooks/backup/backupDaily.sh +++ b/playbooks/backup/backupDaily.sh @@ -7,6 +7,10 @@ now=$(date +"%Y%m%d%H%M") declare -a arr=("mail" "matrix" "monitoring") declare -a monitoring=("monitoring_prometheus-data" "monitoring_grafana-storage" "monitoring_loki-data" "monitoring_alloy-data") declare -a matrix=("matrix_db") +declare -a immich=("systemd-immich-pgdata" "systemd-immich-upload") + +gitea_uid=$(id -u gitea) +immich_uid=$(id -u immich) restore() { for i in "${arr[@]}"; do @@ -21,6 +25,10 @@ restore() { for j in "${matrix[@]}"; do rm -rf /opt/beeserver/matrix/${j}.tar done + + systemctl --user --machine gitea@.host start gitea-db.service gitea-server.service || true + systemctl --user --machine immich@.host start immich-db.service immich-redis.service immich-server.service || true + rm -f /home/immich/systemd-immich-*.tar } trap restore EXIT @@ -48,4 +56,17 @@ do podman-compose up -d done -tar -czf - /opt/backup/beeserver | gpg --batch --passphrase-file /opt/backup/passphrase.txt -c -o /home/beeshare/raid/serverBackup/beeserver_daily_${now}.tar.gz.gpg \ No newline at end of file +systemctl --user --machine gitea@.host stop gitea-server.service gitea-db.service +rsync -aH /home/gitea/data /opt/backup/beeserver/gitea +systemctl --user --machine gitea@.host start gitea-db.service gitea-server.service + +systemctl --user --machine immich@.host stop immich-server.service immich-db.service immich-redis.service +for v in "${immich[@]}" +do + sudo -u immich XDG_RUNTIME_DIR=/run/user/${immich_uid} podman volume export ${v} --output /home/immich/${v}.tar +done +systemctl --user --machine immich@.host start immich-db.service immich-redis.service immich-server.service +mkdir -p /opt/backup/beeserver/immich/ +mv /home/immich/systemd-immich-*.tar /opt/backup/beeserver/immich/ + +tar -czf - /opt/backup/beeserver | gpg --batch --passphrase-file /opt/backup/passphrase.txt -c -o /home/beeshare/raid/serverBackup/beeserver_daily_${now}.tar.gz.gpg diff --git a/playbooks/nginx/sites-enabled/secretbee.buzz b/playbooks/nginx/sites-enabled/secretbee.buzz index 9e91834..82ff70d 100644 --- a/playbooks/nginx/sites-enabled/secretbee.buzz +++ b/playbooks/nginx/sites-enabled/secretbee.buzz @@ -1,5 +1,10 @@ limit_req_zone $binary_remote_addr zone=mylimit:10m rate=10r/s; +map $http_user_agent $link_preview_bot { + default 0; + "~*(Discordbot|Twitterbot|facebookexternalhit|Facebot|Slackbot|TelegramBot|WhatsApp|LinkedInBot|Pinterest|redditbot|Iframely|vkShare|SkypeUriPreview|Mastodon|Googlebot|bingbot)" 1; +} + server { listen 80 default_server; server_name secretbee.buzz; @@ -50,7 +55,10 @@ server { try_files $uri $uri.html $uri/index.html index.html; } - location /siri { + location = /siri { + if ($link_preview_bot) { + rewrite ^ /siri.html last; + } return 301 https://gallery.secretbee.buzz/s/siri; } } diff --git a/playbooks/nginx/www/siri-cover.png b/playbooks/nginx/www/siri-cover.png new file mode 100644 index 0000000..9a81a38 Binary files /dev/null and b/playbooks/nginx/www/siri-cover.png differ diff --git a/playbooks/nginx/www/siri.html b/playbooks/nginx/www/siri.html new file mode 100644 index 0000000..ab68b78 --- /dev/null +++ b/playbooks/nginx/www/siri.html @@ -0,0 +1,28 @@ + + +
+