From 06743d8a11af7a9b8c3ab9ee53406cfdd306b2dd Mon Sep 17 00:00:00 2001 From: Mathieu Strypsteen Date: Wed, 15 Jan 2025 11:50:57 +0100 Subject: [PATCH] Remove ntfy --- container-config/caddy/Caddyfile | 5 ----- home/etc/containers/systemd/ntfy.container | 14 -------------- setup-vyos.sh | 5 +++-- 3 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 home/etc/containers/systemd/ntfy.container diff --git a/container-config/caddy/Caddyfile b/container-config/caddy/Caddyfile index c3bd99c..4a8137c 100644 --- a/container-config/caddy/Caddyfile +++ b/container-config/caddy/Caddyfile @@ -117,11 +117,6 @@ photos.strypsteen.com { import tls reverse_proxy http://home.server.home.arpa:8006 } -push.strypsteen.com { - import base - import tls - reverse_proxy http://home.server.home.arpa:8003 -} remote-desktop.strypsteen.com { import base import local-only diff --git a/home/etc/containers/systemd/ntfy.container b/home/etc/containers/systemd/ntfy.container deleted file mode 100644 index c86b4e0..0000000 --- a/home/etc/containers/systemd/ntfy.container +++ /dev/null @@ -1,14 +0,0 @@ -[Container] -Image=docker.io/binwiederhier/ntfy -Exec=serve -Volume=systemd-ntfy:/var/lib/ntfy:U,Z -Environment=NTFY_AUTH_DEFAULT_ACCESS=write-only -Environment=NTFY_AUTH_FILE=/var/lib/ntfy/auth.db -Environment=NTFY_BASE_URL=https://push.strypsteen.com -Environment=NTFY_BEHIND_PROXY=true -Environment=NTFY_CACHE_FILE=/var/lib/ntfy/cache.db -Environment=NTFY_ENABLE_LOGIN=true -PublishPort=10.0.1.2:8003:80 -AutoUpdate=registry -[Install] -WantedBy=multi-user.target diff --git a/setup-vyos.sh b/setup-vyos.sh index e962e25..0459c97 100644 --- a/setup-vyos.sh +++ b/setup-vyos.sh @@ -3,6 +3,7 @@ set system name-server 9.9.9.9 set system static-host-mapping host-name pve.strypsteen.com inet 192.168.253.2 set system static-host-mapping host-name home.strypsteen.com inet 192.168.253.4 +set system static-host-mapping host-name home.strypsteen.com alias infra.server.home.arpa set system static-host-mapping host-name home.strypsteen.com alias auth.strypsteen.com set system static-host-mapping host-name home.strypsteen.com alias cloud.strypsteen.com set system static-host-mapping host-name home.strypsteen.com alias code.strypsteen.com @@ -40,7 +41,7 @@ set service dhcp-server shared-network-name mgmt option name-server 192.168.255. set service dhcp-server shared-network-name mgmt subnet 192.168.255.0/24 subnet-id 1 set service dhcp-server shared-network-name mgmt subnet 192.168.255.0/24 range 0 start 192.168.255.2 set service dhcp-server shared-network-name mgmt subnet 192.168.255.0/24 range 0 stop 192.168.255.254 -set service dhcp-server shared-network-name mgmt subnet 192.168.255.0/24 lease 3600 +set service dhcp-server shared-network-name mgmt subnet 192.168.255.0/24 lease 7200 set service dhcp-server shared-network-name lan option default-router 192.168.254.1 set service dhcp-server shared-network-name lan option name-server 192.168.254.1 set service dhcp-server shared-network-name lan subnet 192.168.254.0/24 subnet-id 2 @@ -55,7 +56,7 @@ set service dhcp-server shared-network-name server option name-server 192.168.25 set service dhcp-server shared-network-name server subnet 192.168.253.0/24 subnet-id 3 set service dhcp-server shared-network-name server subnet 192.168.253.0/24 range 0 start 192.168.253.5 set service dhcp-server shared-network-name server subnet 192.168.253.0/24 range 0 stop 192.168.253.200 -set service dhcp-server shared-network-name server subnet 192.168.253.0/24 lease 3600 +set service dhcp-server shared-network-name server subnet 192.168.253.0/24 lease 7200 set service router-advert interface eth1 prefix ::/64 set service router-advert interface eth1 name-server fc00::1 set service router-advert interface eth2 prefix ::/64