diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 0148c4e..f0f8874 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -1,6 +1,11 @@ { email bensuperpc@gmail.com - key_type ed25519 + key_type p384 + + log { + output file /data/logs/access.log + format console + } } import bensuperpc.org/Caddyfile diff --git a/caddy/bensuperpc.org/Caddyfile b/caddy/bensuperpc.org/Caddyfile index 5c8c231..d6bed71 100644 --- a/caddy/bensuperpc.org/Caddyfile +++ b/caddy/bensuperpc.org/Caddyfile @@ -5,7 +5,7 @@ www.bensuperpc.org { file_server encode zstd gzip - metrics /metrics + #metrics /metrics @disallowed { path /xmlrpc.php @@ -30,11 +30,6 @@ www.bensuperpc.org { # clickjacking protection X-Frame-Options DENY } - - log { - output file /data/logs/access.log - format console - } } bensuperpc.org { @@ -42,21 +37,18 @@ bensuperpc.org { } adminer.bensuperpc.org { - reverse_proxy adminer:8080 + #reverse_proxy adminer:8080 } uptimekuma.bensuperpc.org { reverse_proxy uptime-kuma:3001 } -portainer.bensuperpc.org { - reverse_proxy portainer:9000 +link.bensuperpc.org { + redir /rickroll https://www.youtube.com/watch?v=dQw4w9WgXcQ permanent + redir /babyshark https://www.youtube.com/watch?v=XqZsoesa55w permanent } -rickroll.bensuperpc.org { - redir https://www.youtube.com/watch?v=dQw4w9WgXcQ permanent -} - -babyshark.bensuperpc.org { - redir https://www.youtube.com/watch?v=XqZsoesa55w permanent -} +#rickroll.bensuperpc.org { +# redir https://www.youtube.com/watch?v=dQw4w9WgXcQ permanent +#} diff --git a/docker-compose.yml b/docker-compose.yml index 90555be..6a9cfa4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -99,20 +99,6 @@ services: - blog-network security_opt: - no-new-privileges:true - - portainer: - image: portainer/portainer-ce:latest - container_name: portainer - profiles: - - portainer - restart: on-failure - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - portainer_data:/data - networks: - - blog-network - security_opt: - - no-new-privileges:true networks: blog-network: driver: bridge @@ -129,5 +115,3 @@ volumes: name: caddy_config uptimekuma_data: name: uptimekuma_data - portainer_data: - name: portainer_data