Merge remote-tracking branch 'origin'

.gitignore

@@ -3,3 +3,6 @@ nginxproxymanager/letsencrypt/
 nginxproxymanager/mysql/
 
 cloudflare/tailscale/
+nginxproxymanager/*/
+ntfy/*/
+vaultwarden/*/

ntfy/docker-compose.yml

@@ -0,0 +1,23 @@
+version: "2.1"
+services:
+  ntfy:
+    image: binwiederhier/ntfy:latest
+    container_name: ntfy
+    command:
+      - serve
+    environment:
+      - TZ=America/New_York    # optional: Change to your desired timezone
+    user: 1000:1000 # optional: Set custom user/group or uid/gid
+    volumes:
+      - ./var/cache/ntfy:/var/cache/ntfy
+      - ./etc/ntfy:/etc/ntfy
+    ports:
+      - 4080:80
+      - 4443:443
+    healthcheck: # optional: remember to adapt the host:port to your environment
+        test: ["CMD-SHELL", "wget -q --tries=1 https://notify.peterwood.rocks/v1/health -O - | grep -Eo '\"healthy\"\\s*:\\s*true' || exit 1"]
+        interval: 60s
+        timeout: 10s
+        retries: 3
+        start_period: 40s
+    restart: unless-stopped

ntfy/server.yml

@@ -0,0 +1,5 @@
+base-url: "https://notify.peterwood.rocks"
+upstream-base-url: "https://ntfy.sh"
+# attachment-cache-dir: "/var/cache/ntfy/attachments"
+# auth-file: "./var/lib/ntfy/user.db"
+auth-default-access: "read-write"

ntfy/update_config.sh

@@ -0,0 +1,6 @@
+#/bin/bash
+
+cd /home/acedanger/ntfy
+docker cp /home/acedanger/ntfy/server.yml ntfy:/etc/ntfy/server.yml
+docker-compose down
+docker-compose up -d

vaultwarden/docker-compose.yml

@@ -1,10 +1,10 @@
 version: "3"
 services:
   vaultwarden:
-    image: vaultwarden/server:latest
+    image: vaultwarden/server:1.29.2
     container_name: vaultwarden
     ports:
-      - 95:80
+      - 7080:80
 #      - 5443:443
     volumes:
       - vaultwarden_data:/data