Serve www directly from caddy
This commit is contained in:
parent
8325b9a759
commit
1490487e7b
4 changed files with 6 additions and 89 deletions
|
@ -66,7 +66,10 @@
|
||||||
|
|
||||||
@www host www.{$DOMAIN}
|
@www host www.{$DOMAIN}
|
||||||
handle @www {
|
handle @www {
|
||||||
reverse_proxy webserver-www:80
|
file_server {
|
||||||
|
root /usr/share/caddy
|
||||||
|
hide .git Readme.md
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@mail host mail.{$DOMAIN}
|
@mail host mail.{$DOMAIN}
|
||||||
|
|
|
@ -14,6 +14,8 @@ services:
|
||||||
- $PWD/caddy/Caddyfile:/etc/caddy/Caddyfile
|
- $PWD/caddy/Caddyfile:/etc/caddy/Caddyfile
|
||||||
- ${STORAGE_PATH}/caddy/data:/data
|
- ${STORAGE_PATH}/caddy/data:/data
|
||||||
- ${STORAGE_PATH}/caddy/config:/config
|
- ${STORAGE_PATH}/caddy/config:/config
|
||||||
|
- ${WWW_PATH}:/usr/share/caddy:ro
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
- NETCUP_CUSTOMER_NUMBER=${NETCUP_CUSTOMER_NUMBER}
|
- NETCUP_CUSTOMER_NUMBER=${NETCUP_CUSTOMER_NUMBER}
|
||||||
- NETCUP_API_KEY=${NETCUP_API_KEY}
|
- NETCUP_API_KEY=${NETCUP_API_KEY}
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
services:
|
|
||||||
|
|
||||||
webserver-www:
|
|
||||||
image: nginx:stable
|
|
||||||
volumes:
|
|
||||||
- ${HTML}:/usr/share/nginx/html:ro
|
|
||||||
- $PWD/nginx.conf:/etc/nginx/nginx.conf:ro
|
|
||||||
networks:
|
|
||||||
- web
|
|
||||||
restart: unless-stopped
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD", "curl" ,"--fail", "localhost"]
|
|
||||||
interval: 5s
|
|
||||||
timeout: 3s
|
|
||||||
labels:
|
|
||||||
- "docker.group=www"
|
|
||||||
|
|
||||||
networks:
|
|
||||||
web:
|
|
||||||
external: true
|
|
||||||
|
|
|
@ -1,67 +0,0 @@
|
||||||
user nginx;
|
|
||||||
worker_processes auto;
|
|
||||||
|
|
||||||
error_log /var/log/nginx/error.log notice;
|
|
||||||
pid /var/run/nginx.pid;
|
|
||||||
|
|
||||||
|
|
||||||
events {
|
|
||||||
worker_connections 1024;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
http {
|
|
||||||
include /etc/nginx/mime.types;
|
|
||||||
default_type application/octet-stream;
|
|
||||||
|
|
||||||
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
|
||||||
'$status $body_bytes_sent "$http_referer" '
|
|
||||||
'"$http_user_agent" "$http_x_forwarded_for"';
|
|
||||||
|
|
||||||
access_log /var/log/nginx/access.log main;
|
|
||||||
|
|
||||||
sendfile on;
|
|
||||||
#tcp_nopush on;
|
|
||||||
|
|
||||||
keepalive_timeout 65;
|
|
||||||
|
|
||||||
#gzip on;
|
|
||||||
|
|
||||||
# include /etc/nginx/conf.d/*.conf;
|
|
||||||
############################################
|
|
||||||
server {
|
|
||||||
listen 80;
|
|
||||||
listen [::]:80;
|
|
||||||
server_name localhost;
|
|
||||||
|
|
||||||
#access_log /var/log/nginx/host.access.log main;
|
|
||||||
|
|
||||||
location / {
|
|
||||||
root /usr/share/nginx/html;
|
|
||||||
index index.html index.htm;
|
|
||||||
}
|
|
||||||
|
|
||||||
#error_page 404 /404.html;
|
|
||||||
|
|
||||||
# redirect server error pages to the static page /50x.html
|
|
||||||
#
|
|
||||||
error_page 500 502 503 504 /50x.html;
|
|
||||||
location = /50x.html {
|
|
||||||
root /usr/share/nginx/html;
|
|
||||||
}
|
|
||||||
|
|
||||||
# hide .git folder
|
|
||||||
location ~ /\.git {
|
|
||||||
deny all;
|
|
||||||
return 404;
|
|
||||||
}
|
|
||||||
|
|
||||||
location ~ /Readme.md {
|
|
||||||
deny all;
|
|
||||||
return 404;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
# include /etc/nginx/conf.d/*.conf;
|
|
||||||
}
|
|
Loading…
Add table
Reference in a new issue