inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-31 13:15:43 +00:00
Code Activity

Caddy fix (#6690)

Browse Source 
* Caddyfile updates

- Provide CORS headers for /static/ and /media/

* Adjust config_template

- Make more open by default
This commit is contained in:
Oliver
2024-03-13 14:27:26 +11:00
committed by GitHub
parent 6389493c33
commit 2f852c8aa2
2 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
InvenTree/config_template.yaml
View File

@@ -163,8 +163,8 @@ auto_update: False
# Allowed hosts (see ALLOWED_HOSTS in Django settings documentation) # Allowed hosts (see ALLOWED_HOSTS in Django settings documentation)
# A list of strings representing the host/domain names that this Django site can serve. # A list of strings representing the host/domain names that this Django site can serve.
# Default behaviour is to allow all hosts (THIS IS NOT SECURE!) # Default behaviour is to allow all hosts (THIS IS NOT SECURE!)
# allowed_hosts: allowed_hosts:
# - '*' - '*'
# Trusted origins (see CSRF_TRUSTED_ORIGINS in Django settings documentation) # Trusted origins (see CSRF_TRUSTED_ORIGINS in Django settings documentation)
# If you are running behind a proxy, you may need to add the proxy address here # If you are running behind a proxy, you may need to add the proxy address here
@@ -183,10 +183,9 @@ use_x_forwarded_port: false
# Cross Origin Resource Sharing (CORS) settings (see https://github.com/adamchainz/django-cors-headers) # Cross Origin Resource Sharing (CORS) settings (see https://github.com/adamchainz/django-cors-headers)
cors: cors:
allow_all: true
allow_credentials: true allow_credentials: true
# allow_all: false
# whitelist: # whitelist:
# - https://example.com # - https://example.com
# - https://sub.example.com # - https://sub.example.com
@@ -199,11 +198,8 @@ cors:
# STATIC_ROOT is the local filesystem location for storing static files # STATIC_ROOT is the local filesystem location for storing static files
#static_root: '/home/inventree/data/static' #static_root: '/home/inventree/data/static'
### Backup configuration options ###
# INVENTREE_BACKUP_DIR is the local filesystem location for storing backups # INVENTREE_BACKUP_DIR is the local filesystem location for storing backups
backup_storage: django.core.files.storage.FileSystemStorage
#backup_dir: '/home/inventree/data/backup' #backup_dir: '/home/inventree/data/backup'
#backup_options:
# Background worker options # Background worker options
background: background:

23
docker/Caddyfile
View File

@@ -5,7 +5,19 @@
(log_common) { (log_common) {
log { log {
output file /var/log/caddy/{args.0}.access.log output file /var/log/caddy/{args[0]}.access.log
}
}
(cors-headers) {
header Access-Control-Allow-Origin *
header Access-Control-Allow-Methods GET,HEAD,OPTIONS
header Access-Control-Allow-Headers User-Agent,Content-Type
@cors_preflight{args[0]} method OPTIONS
handle @cors_preflight{args[0]} {
respond "" 204
} }
} }
@@ -20,16 +32,21 @@
} }
handle_path /static/* { handle_path /static/* {
import cors-headers static
root * /var/www/static root * /var/www/static
file_server file_server
} }
handle_path /media/* { handle_path /media/* {
import cors-headers media
root * /var/www/media
file_server
forward_auth {$INVENTREE_SERVER:"http://inventree-server:8000"} { forward_auth {$INVENTREE_SERVER:"http://inventree-server:8000"} {
uri /auth/ uri /auth/
} }
root * /var/www/media
file_server
} }
reverse_proxy {$INVENTREE_SERVER:"http://inventree-server:8000"} reverse_proxy {$INVENTREE_SERVER:"http://inventree-server:8000"}