mirror of
https://github.com/fspc/workstand.git
synced 2025-02-23 09:13:23 -05:00
Lol I hate my life.
This commit is contained in:
parent
04bf115307
commit
b26101dfc1
@ -40,7 +40,7 @@ LOGGING = {
|
|||||||
WEBPACK_LOADER = {
|
WEBPACK_LOADER = {
|
||||||
'DEFAULT': {
|
'DEFAULT': {
|
||||||
'CACHE': True,
|
'CACHE': True,
|
||||||
'BUNDLE_DIR_NAME': 'assets/dist/', # must end with slash
|
'BUNDLE_DIR_NAME': 'dist/', # must end with slash
|
||||||
'STATS_FILE': os.path.join(BASE_DIR, '../webpack-stats-prod.json'),
|
'STATS_FILE': os.path.join(BASE_DIR, '../webpack-stats-prod.json'),
|
||||||
'POLL_INTERVAL': 0.1,
|
'POLL_INTERVAL': 0.1,
|
||||||
'IGNORE': ['.+\.hot-update.js', '.+\.map']
|
'IGNORE': ['.+\.hot-update.js', '.+\.map']
|
||||||
|
@ -6,10 +6,14 @@ services:
|
|||||||
image: bcbc/nginx:production
|
image: bcbc/nginx:production
|
||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "80:80"
|
||||||
|
- "443:443"
|
||||||
links:
|
links:
|
||||||
- workstand
|
- workstand
|
||||||
volumes_from:
|
volumes_from:
|
||||||
- workstand:ro
|
- workstand:ro
|
||||||
|
volumes:
|
||||||
|
- certs:/etc/letsencrypt
|
||||||
|
|
||||||
workstand:
|
workstand:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
@ -33,3 +37,5 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
static:
|
static:
|
||||||
external: false
|
external: false
|
||||||
|
certs:
|
||||||
|
external: false
|
||||||
|
@ -1,28 +1,27 @@
|
|||||||
# server {
|
server {
|
||||||
# listen 80;
|
listen 80;
|
||||||
# server_name www.shop.bcbc.bike;
|
server_name www.shop.bcbc.bike;
|
||||||
# # $scheme will get the http protocol
|
# $scheme will get the http protocol
|
||||||
# # and 301 is best practice for tablet, phone, desktop and seo
|
# and 301 is best practice for tablet, phone, desktop and seo
|
||||||
# return 301 https://shop.bcbc.bike$request_uri;
|
return 301 https://shop.bcbc.bike$request_uri;
|
||||||
#}
|
}
|
||||||
#server {
|
|
||||||
# listen 80;
|
|
||||||
# server_name shop.bcbc.bike;
|
|
||||||
# # $scheme will get the http protocol
|
|
||||||
# # and 301 is best practice for tablet, phone, desktop and seo
|
|
||||||
# return 301 https://shop.bcbc.bike$request_uri;
|
|
||||||
#}
|
|
||||||
server {
|
server {
|
||||||
# listen 443 ssl;
|
listen 80;
|
||||||
listen 80;
|
server_name shop.bcbc.bike;
|
||||||
|
# $scheme will get the http protocol
|
||||||
|
# and 301 is best practice for tablet, phone, desktop and seo
|
||||||
|
return 301 https://shop.bcbc.bike$request_uri;
|
||||||
|
}
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
server_name shop.bcbc.bike;
|
server_name shop.bcbc.bike;
|
||||||
|
|
||||||
# ssl_certificate /etc/letsencrypt/live/{{ app_domain_name }}/fullchain.pem;
|
ssl_certificate /etc/letsencrypt/live/shop.bcbc.bike/fullchain.pem;
|
||||||
# ssl_certificate_key /etc/letsencrypt/live/{{ app_domain_name }}/privkey.pem;
|
ssl_certificate_key /etc/letsencrypt/live/shop.bcbc.bike/privkey.pem;
|
||||||
|
|
||||||
# ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
|
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
|
||||||
# ssl_prefer_server_ciphers on;
|
ssl_prefer_server_ciphers on;
|
||||||
# ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH';
|
ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH';
|
||||||
|
|
||||||
location = /favicon.ico { access_log off; log_not_found off; }
|
location = /favicon.ico { access_log off; log_not_found off; }
|
||||||
keepalive_timeout 5;
|
keepalive_timeout 5;
|
||||||
@ -34,7 +33,7 @@ server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
location /static {
|
location /static {
|
||||||
root /code/static;
|
root /code;
|
||||||
}
|
}
|
||||||
|
|
||||||
location @proxy_to_app {
|
location @proxy_to_app {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user