From b26101dfc1f48384989ce18f60847da21db0bddb Mon Sep 17 00:00:00 2001 From: Drew Larson Date: Mon, 16 Jan 2017 17:58:08 -0600 Subject: [PATCH] Lol I hate my life. --- .../bikeshop/settings/production.py | 2 +- docker-compose.prod.yml | 6 +++ docker/nginx/conf/nginx-site.conf | 43 +++++++++---------- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/bikeshop_project/bikeshop/settings/production.py b/bikeshop_project/bikeshop/settings/production.py index 43063ed..e50f654 100644 --- a/bikeshop_project/bikeshop/settings/production.py +++ b/bikeshop_project/bikeshop/settings/production.py @@ -40,7 +40,7 @@ LOGGING = { WEBPACK_LOADER = { 'DEFAULT': { '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'), 'POLL_INTERVAL': 0.1, 'IGNORE': ['.+\.hot-update.js', '.+\.map'] diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 4811f14..e485477 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -6,10 +6,14 @@ services: image: bcbc/nginx:production ports: - "80:80" + - "443:443" links: - workstand volumes_from: - workstand:ro + volumes: + - certs:/etc/letsencrypt + workstand: build: context: . @@ -33,3 +37,5 @@ services: volumes: static: external: false + certs: + external: false diff --git a/docker/nginx/conf/nginx-site.conf b/docker/nginx/conf/nginx-site.conf index 95c369a..e59da90 100644 --- a/docker/nginx/conf/nginx-site.conf +++ b/docker/nginx/conf/nginx-site.conf @@ -1,28 +1,27 @@ -# server { -# listen 80; -# server_name www.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 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 80; + server_name www.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 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; - listen 80; + listen 443 ssl; server_name shop.bcbc.bike; - # ssl_certificate /etc/letsencrypt/live/{{ app_domain_name }}/fullchain.pem; - # ssl_certificate_key /etc/letsencrypt/live/{{ app_domain_name }}/privkey.pem; + ssl_certificate /etc/letsencrypt/live/shop.bcbc.bike/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/shop.bcbc.bike/privkey.pem; - # ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - # ssl_prefer_server_ciphers on; - # ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'; location = /favicon.ico { access_log off; log_not_found off; } keepalive_timeout 5; @@ -34,7 +33,7 @@ server { } location /static { - root /code/static; + root /code; } location @proxy_to_app {