Changeset 8818

Timestamp:

05/20/2019 11:52:22 AM (7 years ago)

Author:

vedjain

Message:

WC Docker: Force https for consistency and avoid mixed content

Earlier https was required but not forced, cause mixed content warning with some images. This patch will redirect all http requests to https.

Location:

sites/trunk/wordcamp.org

Files:

• .docker/Dockerfile (modified) (1 diff)
• .docker/nginx.conf (modified) (1 diff)
• docker-compose.yml (modified) (1 diff)

sites/trunk/wordcamp.org/.docker/Dockerfile

@@ -8 +8 @@
 RUN apt-get update
 RUN apt-get install nginx -y
-COPY nginx.conf /etc/nginx/sites-enabled/wordcamp.conf
+COPY nginx.conf /etc/nginx/sites-enabled/default.conf
 COPY php-fpm.conf /usr/local/etc/php-fpm.d/zz-www.conf
 

sites/trunk/wordcamp.org/.docker/nginx.conf

@@ -6 +6 @@
 
 server {
-    listen 80;
+    listen 80 default_server;
     listen [::]:80;
-    server_name wordcamp.test;
-    return 301 https://wordcamp.test$request_uri;
+    server_name _;
+    return 301 https://$host$request_uri;
 }
 

sites/trunk/wordcamp.org/docker-compose.yml

@@ -9 +9 @@
       - ".docker/wp-config.php:/usr/src/public_html/wp-config.php"
     ports:
-      - "1234:80"
+      - "80:80"
       - "443:443"
       - "1080:1080"