fix: don't override existing modules

anna-is-cute · Jul 14, 2018 · 37a082c · 37a082c
1 parent f020694
commit 37a082c
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 11 deletions.
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
@@ -41,5 +41,5 @@ services:
       - "./nginx/nginx.conf:/etc/nginx/nginx.conf:ro"
       - "./nginx/sites:/etc/nginx/sites:ro"
       - "./nginx/certs:/etc/nginx/certs:ro"
-      - "./nginx/modules:/etc/nginx/modules:ro"
+      - "./nginx/extra_modules:/etc/nginx/extra_modules:ro"
       - "../webserver/web/static:/etc/nginx/web/static:ro"
diff --git a/.docker/nginx/extra_modules/ngx_http_brotli_filter_module.so b/.docker/nginx/extra_modules/ngx_http_brotli_filter_module.so
diff --git a/.docker/nginx/extra_modules/ngx_http_brotli_static_module.so b/.docker/nginx/extra_modules/ngx_http_brotli_static_module.so
diff --git a/.docker/nginx/modules/ngx_http_brotli_filter_module.so b/.docker/nginx/modules/ngx_http_brotli_filter_module.so
diff --git a/.docker/nginx/modules/ngx_http_brotli_static_module.so b/.docker/nginx/modules/ngx_http_brotli_static_module.so
diff --git a/.docker/nginx/nginx.example.conf b/.docker/nginx/nginx.example.conf
@@ -1,8 +1,8 @@
 # NOTE: change this based on your machine (equal to # CPU cores)
 worker_processes 2;
 
-load_module modules/ngx_http_brotli_static_module.so;
-load_module modules/ngx_http_brotli_filter_module.so;
+load_module extra_modules/ngx_http_brotli_static_module.so;
+load_module extra_modules/ngx_http_brotli_filter_module.so;
 
 events {
   # NOTE: change this based on your machine (ulimit -n)
@@ -31,8 +31,7 @@ http {
   brotli_comp_level 4;
   brotli_types text/plain text/css application/javascript application/json image/svg+xml application/xml+rss;
 
-  # TODO: TLS security
-  # ssl_dhparam /etc/ssl/dhparam.pem;
+  ssl_dhparam /etc/ssl/dhparam.pem;
 
   ssl_protocols TLSv1.3 TLSv1.2;
   ssl_ciphers 'TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA';