Swapped gateway ports 70 and 80 to prep for SSL

To run certbot on deployment, it requires the server to be running
on port 80. This change is to prep for certbot use on deployment.
Note that the change in port required the Dockerfile to expose 70:70
for the internal gateway again - as the final deployment uses kuber
this should not pose an issue.

Author: WZWren

compose.yaml

@@ -153,6 +153,8 @@ services:
     image: distractedcat/nginx
     volumes:
       - ./nginx/nginx.conf:/etc/nginx/internal.conf
+    ports:
+      - "70:70"
     depends_on:
       - peerprep
       - backend
@@ -164,7 +166,7 @@ services:
     build: inbound-gateway
     image: wzwren/inbound-gateway
     ports:
-      - "70:70"
+      - "80:80"
     volumes:
       - ./inbound-gateway/nginx.conf:/etc/nginx/external.conf
     depends_on:

inbound-gateway/Dockerfile

@@ -1,4 +1,4 @@
 FROM nginx:alpine 
 COPY nginx.conf /etc/nginx/external.conf
-EXPOSE 70
+EXPOSE 80
 CMD ["nginx", "-c", "external.conf", "-g", "daemon off;"]

inbound-gateway/nginx.conf

@@ -23,14 +23,14 @@ http {
     }
 
     server {
-        listen 70;
+        listen 80;
 
         location / {
             proxy_pass http://peerprep/;
             proxy_set_header   Host               $host;
             proxy_set_header   X-Real-IP          $remote_addr;
             proxy_set_header   X-Forwarded-Proto  $scheme;
-            proxy_set_header   X-Forwarded-Host   $host:70;
+            proxy_set_header   X-Forwarded-Host   $host; # port 80 implicitly removes this port
             proxy_set_header   X-Forwarded-For    $proxy_add_x_forwarded_for;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;

nginx/Dockerfile

@@ -1,4 +1,4 @@
 FROM nginx:alpine 
 COPY nginx.conf /etc/nginx/internal.conf
-EXPOSE 80
+EXPOSE 70
 CMD ["nginx", "-c", "internal.conf", "-g", "daemon off;"]

nginx/nginx.conf

@@ -49,7 +49,7 @@ http {
     # }
 
     server {
-        listen 80;
+        listen 70;
         location / {
             proxy_pass http://peerprep/;
             proxy_set_header   Host               $host;