From ce338fbe2da210afa09306603a81deaad02a15c8 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Thu, 16 Nov 2023 17:08:52 +0000 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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