:gear: laps staging changes

docker-compose.yml

@@ -8,8 +8,8 @@ services:
         image: proxy-nginx
         container_name: reverse-proxy
         ports:
-            - "80:80"
-            - "443:443"
+            - 80:80
+            - 443:443
         restart: always
         networks:
             - staging_network

nginx/Dockerfile

@@ -1,7 +1,7 @@
 FROM nginx
 
 ### Copy files from the temp build
-# COPY ./nginx/temp/index.html /opt/<path-to-project>/index.html
+COPY ./nginx/temp/index.html /usr/share/nginx/index.html
 
 ### Setup SSL
 # RUN mkdir -p /etc/ssl/private && chmod 700 /etc/ssl/private
@@ -12,10 +12,11 @@ FROM nginx
 # COPY ./nginx/keys/letsencrypt.crt /etc/ssl/certs/letsencrypt.crt
 
 ### Configure Nginx to Use SSL
-RUN mkdir -p /etc/nginx/snippets
+# RUN mkdir -p /etc/nginx/snippets
 # COPY ./nginx/configs/letsencrypt.conf /etc/nginx/snippets/letsencrypt.conf
 # COPY ./nginx/configs/ssl-params.conf /etc/nginx/snippets/ssl-params.conf
 
 ### Move over the nginx.conf and default.config server configs
 COPY ./nginx/configs/default.conf /etc/nginx/conf.d/default.conf
 COPY ./nginx/configs/nginx.conf /etc/nginx/nginx.conf
+

nginx/configs/default.conf

@@ -1,63 +1,64 @@
 # Upstream sites for proxy-ing
-upstream wp {
-     server <YOUR_SERVER_IP_ADDRESS>:8082;
+upstream js {
+        server js-wp;
+}
+upstream laps {
+        server laps-wp;
 }
 
-### Redirect regular traffic to SSL
 server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
+	listen		80;
+	listen		[::]:80;
+	server_name	jeffreysmithillustrator.com www.jeffreysmithillustrator.com;
+	
+	location / {
+		#blocks blank user_agents
+                if ($http_user_agent = "") { return  301 $scheme://www.google.com/; }
 
-    server_name <CHANGE_ME> www.<CHANGE_ME>;
+	        proxy_set_header    Host                 $server_name;
+	        proxy_set_header    X-Real-IP            $remote_addr;
+	        proxy_set_header    X-Forwarded-For      $proxy_add_x_forwarded_for;
+		proxy_set_header    X-Forwarded-Proto    $scheme;
 
-    # return 301 https://$host$request_uri;
+		proxy_pass          http://js;
+		proxy_redirect      off;
 
-    # root /opt/app/public/;
-    # WP Test
-    root /var/www/html;
-    index index.html index.htm index.php index.nginx-debian.html;
+		proxy_connect_timeout   300;
+                proxy_send_timeout      300;
+                proxy_read_timeout      300;
+	}
 
-    location / {
-        proxy_set_header    Host                 $host;
-        proxy_set_header    X-Real-IP            $remote_addr;
-        proxy_set_header    X-Forwarded-For      $proxy_add_x_forwarded_for;
-        proxy_set_header    X-Forwarded-Proto    $scheme;
+        location ~/\.ht {
+                deny all;
+        }
 
-        proxy_pass          http://wp;
-        proxy_redirect      off;
-    }
 }
 
-### SSL Stuff
 server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-
-    server_name <CHANGE_ME> www.<CHANGE_ME>;
+	listen		80;
+	listen		[::]:80;
+	server_name	staging.laprintmaking.com;
+	
+	location / {
+		#blocks blank user_agents
+                if ($http_user_agent = "") { return  301 $scheme://www.google.com/; }
 
-    include snippets/letsencrypt.conf;
-    include snippets/ssl-params.conf;
+	        proxy_set_header    Host                 $server_name;
+	        proxy_set_header    X-Real-IP            $remote_addr;
+	        proxy_set_header    X-Forwarded-For      $proxy_add_x_forwarded_for;
+		proxy_set_header    X-Forwarded-Proto    $scheme;
 
-    root /var/www/html;
-    index index.html index.htm index.php index.nginx-debian.html;
+		proxy_pass          http://laps;
+		proxy_redirect      off;
 
-    # location / {
-    #    try_files $uri $uri/ /index.php;
-    # }
+		proxy_connect_timeout   300;
+                proxy_send_timeout      300;
+                proxy_read_timeout      300;
+	}
 
-    location / {
-        proxy_set_header        Host              $host;
-        proxy_set_header        X-Real-IP         $remote_addr;
-        proxy_set_header        X-Forwarded-For   $proxy_add_x_forwarded_for;
-        proxy_set_header        X-Forwarded-Proto $scheme;
-        proxy_set_header        Accept-Encoding   "";
-        proxy_set_header        Proxy             "";
+        location ~/\.ht {
+                deny all;
+        }
 
-        proxy_pass          http://wp;
-        proxy_redirect      off;
-    }
+}
 
-    location ~/\.ht {
-        deny all;
-    }
-}

nginx/configs/nginx.conf

@@ -25,16 +25,16 @@ http {
 
     keepalive_timeout  65;
 
-	gzip  on;
-    gzip_vary on;
-    gzip_min_length 10240;
-    gzip_proxied expired no-cache no-store private auth;
-    gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml;
-    gzip_disable "MSIE [1-6]\.";
+    #gzip  on;
+    #gzip_vary on;
+    #gzip_min_length 10240;
+    #gzip_proxied expired no-cache no-store private auth;
+    #gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml;
+    #gzip_disable "MSIE [1-6]\.";
 
     # Enable ngx_http_gzip_static_module for serving compressed files when possible.
-    gzip_static on;
+    #gzip_static on;
 
     # Bring over default server config
     include /etc/nginx/conf.d/default.conf;
-}
+}