Merge remote-tracking branch 'refs/remotes/origin/master'

.gitignore

@@ -0,0 +1,4 @@
+cloudflare/tailscale/
+nginxproxymanager/*/
+ntfy/*/
+vaultwarden/*/

cloudflare/docker-compose.yml

@@ -0,0 +1,26 @@
+version: "3.8"
+services:
+  cloudflared:
+    image: cloudflare/cloudflared
+    container_name: cloudflare-tunnel
+    restart: unless-stopped
+#    command: tunnel run
+    command: 'tunnel --no-autoupdate run --token eyJhIjoiNWFjNGVkOTQ4ZGUwN2RhMjJlMzcwNDg0NTY3Y2M1M2YiLCJ0IjoiOTFlMGJkZTYtZmU1Zi00OTIwLWJhMjUtM2JkM2U3NjAyYWNjIiwicyI6Ik5qRmxZVEptTW1VdFpHVm1NUzAwWkRReUxUZzNZV1l0TUdJMU1UQXhOV1EwTmpGbCJ9'
+#    environment:
+#      - TUNNEL_TOKEN:eyJhIjoiNWFjNGVkOTQ4ZGUwN2RhMjJlMzcwNDg0NTY3Y2M1M2YiLCJ0IjoiOTFlMGJkZTYtZmU1Zi00OTIwLWJhMjUtM2JkM2U3NjAyYWNjIiwicyI6Ik5qRmxZVEptTW1VdFpHVm1NUzAwWkRReUxUZzNZV1l0TUdJMU1UQXhOV1EwTmpGbCJ9
+    depends_on:
+      - tailscale
+  tailscale:
+    container_name: tailscale
+    image: tailscale/tailscale:stable
+    volumes:
+      - ./tailscale:/var/lib # State data will be stored in this directory 
+      - /dev/net/tun:/dev/net/tun # Required for tailscale to work 
+    cap_add: # Required for tailscale to work 
+      - net_admin
+      - sys_module
+    environment:
+      - TS_AUTHKEY:tskey-auth-kX5Bk35CNTRL-xfRHaskRsLWNK4KhLTcxPWcUbw5v3u93
+    command: tailscaled
+    privileged: true
+    restart: unless-stopped

memos/docker-compose.yml

@@ -7,3 +7,4 @@ services:
       - ~/.memos/:/var/opt/memos
     ports:
       - 5230:5230
+    restart: unless-stopped

nginxproxymanager/docker-compose.yml

@@ -0,0 +1,43 @@
+version: '3.8'
+services:
+  app:
+    image: 'jc21/nginx-proxy-manager:latest'
+    restart: unless-stopped
+    ports:
+      # These ports are in format <host-port>:<container-port>
+      - '80:80' # Public HTTP Port
+      - '443:443' # Public HTTPS Port
+      - '81:81' # Admin Web Port
+      # Add any other Stream port you want to expose
+      # - '21:21' # FTP
+
+    # Uncomment the next line if you uncomment anything in the section
+    # environment:
+      # Uncomment this if you want to change the location of
+      # the SQLite DB file within the container
+      # DB_SQLITE_FILE: "/data/database.sqlite"
+
+      # Uncomment this if IPv6 is not enabled on your host
+      # DISABLE_IPV6: 'true'
+    environment:
+      # Mysql/Maria connection parameters:
+      DB_MYSQL_HOST: "db"
+      DB_MYSQL_PORT: 3306
+      DB_MYSQL_USER: "npm"
+      DB_MYSQL_PASSWORD: "npm"
+      DB_MYSQL_NAME: "npm"
+    volumes:
+      - ./data:/data
+      - ./letsencrypt:/etc/letsencrypt
+    depends_on:
+      - db
+  db:
+    image: 'jc21/mariadb-aria:latest'
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: 'npm'
+      MYSQL_DATABASE: 'npm'
+      MYSQL_USER: 'npm'
+      MYSQL_PASSWORD: 'npm'
+    volumes:
+      - ./mysql:/var/lib/mysql

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,7 @@
+#/bin/bash
+
+cd /home/acedanger/docker/ntfy
+docker cp /home/acedanger/docker/ntfy/server.yml ntfy:/etc/ntfy/server.yml
+docker compose down
+docker compose pull
+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