Skip to content
Merged

Caddy #1424

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env_sample
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ MAX_EXECUTION_TIME_LIMIT=600 # time limit for the default queue (in seconds)
DOMAIN_NAME=localhost:80

# SSL style domain definition
TLS_EMAIL=your@email.com
# DOMAIN_NAME=example.com:443
# TLS_EMAIL=your@email.com

RABBITMQ_HOST=rabbit
RABBITMQ_DEFAULT_USER=rabbit-username
Expand Down
30 changes: 18 additions & 12 deletions Caddyfile
Original file line number Diff line number Diff line change
@@ -1,29 +1,35 @@
{$DOMAIN_NAME} {
# HTTPS options:
# HTTPS Options
tls {$TLS_EMAIL}


# Test HTTPS setup
# tls {$TLS_EMAIL} {
# ca https://acme-staging-v02.api.letsencrypt.org/directory
# }


# Removing some headers for improved security:
header / -Server
header -Server

# Serves static files, should be the same as `STATIC_ROOT` setting:
root /var/www/django

# Serving dynamic requests:
proxy / django:8000 {
except /static /media
transparent
websocket
root * /var/www/django
file_server

@noStatic {
not path /static/*
not path /media/*
}

# Serving dynamic requests:
reverse_proxy @noStatic django:8000

# Allows to use `.gz` files when available:
gzip
encode gzip

# Logs:
log stdout
errors stdout
log {
output stdout
format console
}
}
9 changes: 5 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ services:
# Web Services
#-----------------------------------------------
caddy:
image: abiosoft/caddy:1.0.3
image: caddy:2.7.6
env_file: .env
environment:
- ACME_AGREE=true
volumes:
- ./Caddyfile:/etc/Caddyfile
- ./Caddyfile:/etc/caddy/Caddyfile
- ./src/staticfiles:/var/www/django/static
- ./certs/caddy:/etc/caddycerts
- ./caddy_data:/data
- ./caddy_config:/config
restart: unless-stopped
ports:
- 80:80
Expand Down Expand Up @@ -231,4 +232,4 @@ services:
logging:
options:
max-size: "20k"
max-file: "10"
max-file: "10"