diff --git a/caddy/.env b/caddy/.env index e8dfe0a..ad0ba05 100644 --- a/caddy/.env +++ b/caddy/.env @@ -1,3 +1,3 @@ -ACME_CODER_USER= -ACME_CODER_PASS= -ACME_CODER_SUBD= +ACMEDNS_CODER_USER= +ACMEDNS_CODER_PASS= +ACMEDNS_CODER_SUBD= diff --git a/caddy/config/conf.002.d/node002.hawk-toad.ts.net.conf b/caddy/config/conf.002.d/node002.hawk-toad.ts.net.conf new file mode 100644 index 0000000..926ae34 --- /dev/null +++ b/caddy/config/conf.002.d/node002.hawk-toad.ts.net.conf @@ -0,0 +1,8 @@ +node002.hawk-toad.ts.net { + import default + + @prometheus { + header X-App-Target prometheus + } + reverse_proxy @prometheus host.docker.internal:9090 +} diff --git a/caddy/config/conf.002.d/prometheus.serguzim.me.conf b/caddy/config/conf.002.d/prometheus.serguzim.me.conf index 18cf8db..72ec08d 100644 --- a/caddy/config/conf.002.d/prometheus.serguzim.me.conf +++ b/caddy/config/conf.002.d/prometheus.serguzim.me.conf @@ -4,8 +4,3 @@ prometheus.serguzim.me { reverse_proxy host.docker.internal:9090 } - -prometheus.internal.serguzim.net:80 { - import default - reverse_proxy host.docker.internal:9090 -} diff --git a/caddy/config/conf.002.d/recipies.serguzim.me.conf b/caddy/config/conf.002.d/recipes.serguzim.me.conf similarity index 65% rename from caddy/config/conf.002.d/recipies.serguzim.me.conf rename to caddy/config/conf.002.d/recipes.serguzim.me.conf index ad5f23a..aa75aae 100644 --- a/caddy/config/conf.002.d/recipies.serguzim.me.conf +++ b/caddy/config/conf.002.d/recipes.serguzim.me.conf @@ -1,4 +1,4 @@ -recipies.serguzim.me { +recipes.serguzim.me { import default reverse_proxy tandoor:80 } diff --git a/caddy/config/snippets b/caddy/config/snippets index f4a025c..36afda2 100644 --- a/caddy/config/snippets +++ b/caddy/config/snippets @@ -21,9 +21,9 @@ (acmedns) { tls { dns acmedns { - username {args.0} - password {args.1} - subdomain {args.2} + username "{args.0}" + password "{args.1}" + subdomain "{args.2}" server_url https://acme.serguzim.me } } diff --git a/caddy/docker-compose.yml b/caddy/docker-compose.yml index 0c1bfb5..516af9c 100644 --- a/caddy/docker-compose.yml +++ b/caddy/docker-compose.yml @@ -18,6 +18,7 @@ services: volumes: - ./config:/etc/caddy/ - data:/data + - /run/tailscale/tailscaled.sock:/run/tailscale/tailscaled.sock extra_hosts: - host.docker.internal:host-gateway networks: