From 7d3b2c6a58672397c8f4755517ac948e79bad200 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Fri, 3 Nov 2023 20:19:36 +0000 Subject: [PATCH 01/11] added nginxproxymanager --- nginxproxymanager/docker-compose.yml | 43 ++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 nginxproxymanager/docker-compose.yml diff --git a/nginxproxymanager/docker-compose.yml b/nginxproxymanager/docker-compose.yml new file mode 100644 index 0000000..6f7c505 --- /dev/null +++ b/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 : + - '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 From a3f4447c0cacd56f6cea4c512b64840726666d57 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Sun, 5 Nov 2023 19:43:19 -0500 Subject: [PATCH 02/11] added tailscale and cloudflare to cloudflare tunnels --- cloudflare/docker-compose.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 cloudflare/docker-compose.yml diff --git a/cloudflare/docker-compose.yml b/cloudflare/docker-compose.yml new file mode 100644 index 0000000..bfdb228 --- /dev/null +++ b/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 From d8760c8aba679bf34240579a505970c9b10b8f02 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Tue, 7 Nov 2023 19:20:51 +0000 Subject: [PATCH 03/11] added kasm --- kasm/docker-compose.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 kasm/docker-compose.yml diff --git a/kasm/docker-compose.yml b/kasm/docker-compose.yml new file mode 100644 index 0000000..96baadb --- /dev/null +++ b/kasm/docker-compose.yml @@ -0,0 +1,21 @@ +version: "3" +services: + kasm: + image: lscr.io/linuxserver/kasm:latest + container_name: kasm + pull_policy: always + privileged: true + environment: + - KASM_PORT=6443 + # - DOCKER_HUB_USERNAME=USER #optional + # - DOCKER_HUB_PASSWORD=PASS #optional + # - DOCKER_MTU=1500 #optional + volumes: + - ./data:/opt + # - /path/to/profiles:/profiles #optional + # - /dev/input:/dev/input #optional + # - /run/udev/data:/run/udev/data #optional + ports: + - 6000:3000 + - 6443:443 + restart: unless-stopped \ No newline at end of file From f51bc5e2b3e433af7dece39315652614ce2a3ac6 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Tue, 7 Nov 2023 14:38:01 -0500 Subject: [PATCH 04/11] removed kasm --- kasm/docker-compose.yml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 kasm/docker-compose.yml diff --git a/kasm/docker-compose.yml b/kasm/docker-compose.yml deleted file mode 100644 index 96baadb..0000000 --- a/kasm/docker-compose.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3" -services: - kasm: - image: lscr.io/linuxserver/kasm:latest - container_name: kasm - pull_policy: always - privileged: true - environment: - - KASM_PORT=6443 - # - DOCKER_HUB_USERNAME=USER #optional - # - DOCKER_HUB_PASSWORD=PASS #optional - # - DOCKER_MTU=1500 #optional - volumes: - - ./data:/opt - # - /path/to/profiles:/profiles #optional - # - /dev/input:/dev/input #optional - # - /run/udev/data:/run/udev/data #optional - ports: - - 6000:3000 - - 6443:443 - restart: unless-stopped \ No newline at end of file From ce338fbe2da210afa09306603a81deaad02a15c8 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Thu, 16 Nov 2023 17:08:52 +0000 Subject: [PATCH 05/11] ignore any files within each directory --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..076bcd7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +nginxproxymanager/*/ +ntfy/*/ +vaultwarden/*/ From d1f64e6b242cff50cd5de89b0b02c252ff17d6a5 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Thu, 16 Nov 2023 17:53:17 +0000 Subject: [PATCH 06/11] updated exposed port; pin version 1.29.2 since 1.30/latest tag wasn't working. the image was stuck in a restarting loop. --- vaultwarden/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml index d3d7070..46adde8 100644 --- a/vaultwarden/docker-compose.yml +++ b/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 From f8686a1eec8f19f981eb3c444ff2b3456bc80c51 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Thu, 16 Nov 2023 17:54:15 +0000 Subject: [PATCH 07/11] ntfy docker compose; server config and a shell script to push it to the docker container --- ntfy/docker-compose.yml | 23 +++++++++++++++++++++++ ntfy/server.yml | 5 +++++ ntfy/update_config.sh | 6 ++++++ 3 files changed, 34 insertions(+) create mode 100644 ntfy/docker-compose.yml create mode 100644 ntfy/server.yml create mode 100755 ntfy/update_config.sh diff --git a/ntfy/docker-compose.yml b/ntfy/docker-compose.yml new file mode 100644 index 0000000..2339d96 --- /dev/null +++ b/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 diff --git a/ntfy/server.yml b/ntfy/server.yml new file mode 100644 index 0000000..c03de31 --- /dev/null +++ b/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" diff --git a/ntfy/update_config.sh b/ntfy/update_config.sh new file mode 100755 index 0000000..cf3807e --- /dev/null +++ b/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 From 0be965d94189324db2383722c42a64e5a6db966b Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Wed, 22 Nov 2023 16:24:59 -0500 Subject: [PATCH 08/11] added restart policy --- memos/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/memos/docker-compose.yml b/memos/docker-compose.yml index 375980c..42e4858 100644 --- a/memos/docker-compose.yml +++ b/memos/docker-compose.yml @@ -7,3 +7,4 @@ services: - ~/.memos/:/var/opt/memos ports: - 5230:5230 + restart: unless-stopped From f4f934ab8584685b8db5696e52bc919c95952a28 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Wed, 22 Nov 2023 16:28:40 -0500 Subject: [PATCH 09/11] ignoring cloudflare/tailscale directory --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bbcd4ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +nginxproxymanager/data/ +nginxproxymanager/letsencrypt/ +nginxproxymanager/mysql/ + +cloudflare/tailscale/ From a720794376b5c4001fceff0b2869ebc244221ea7 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Thu, 23 Nov 2023 13:55:36 +0000 Subject: [PATCH 10/11] renamed shell script --- ntfy/update-config.sh | 7 +++++++ ntfy/update_config.sh | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100755 ntfy/update-config.sh delete mode 100755 ntfy/update_config.sh diff --git a/ntfy/update-config.sh b/ntfy/update-config.sh new file mode 100755 index 0000000..34da9b7 --- /dev/null +++ b/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 diff --git a/ntfy/update_config.sh b/ntfy/update_config.sh deleted file mode 100755 index cf3807e..0000000 --- a/ntfy/update_config.sh +++ /dev/null @@ -1,6 +0,0 @@ -#/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 From 8e061c56560c0474779b48fcbe75481693e62e38 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Thu, 23 Nov 2023 13:56:01 +0000 Subject: [PATCH 11/11] simplified directories ignored --- .gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitignore b/.gitignore index 05a7ab4..eee2d82 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ -nginxproxymanager/data/ -nginxproxymanager/letsencrypt/ -nginxproxymanager/mysql/ - cloudflare/tailscale/ nginxproxymanager/*/ ntfy/*/