From 30ddbeefc0c167801ac8bd08610fc77bfadc60e8 Mon Sep 17 00:00:00 2001
From: Michael Winsauer <e1429715@student.tuwien.ac.at>
Date: Sun, 20 Jan 2019 21:16:23 +0100
Subject: [PATCH] Change nginx port to 8080

---
 g6t4.yml                           |  6 +---
 service-website/Dockerfile         |  1 +
 service-website/nginx/default.conf | 45 ++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 service-website/nginx/default.conf

diff --git a/g6t4.yml b/g6t4.yml
index 52e351f..71ed581 100644
--- a/g6t4.yml
+++ b/g6t4.yml
@@ -4,7 +4,6 @@ services:
     build: ./camunda-overlay
     container_name: camunda
     ports:
-#    restart: always
       - "8085:8085"
     depends_on:
       - service-analysis
@@ -16,7 +15,6 @@ services:
     container_name: analysis
     ports:
       - "8081:8081"
-#    restart: always
 
   service-failover:
     build: ./service-failover
@@ -30,19 +28,17 @@ services:
     container_name: reporting
     ports:
       - "8083:8083"
-#    restart: always
 
   service-twitter:
     build: ./service-twitter
     container_name: twitter
     ports:
       - "8084:8084"
-#    restart: always
 
   service-website:
     build: ./service-website
     container_name: website
     ports:
-      - "8080:80"
+      - "8080:8080"
     depends_on:
       - camunda
diff --git a/service-website/Dockerfile b/service-website/Dockerfile
index 6c8e0c6..c189aa2 100644
--- a/service-website/Dockerfile
+++ b/service-website/Dockerfile
@@ -14,5 +14,6 @@ LABEL maintainer="Michael Winsauer <e1429715@student.tuwien.ac.at>"
 EXPOSE 80
 
 COPY --from=react-build /app/build /usr/share/nginx/html
+COPY ./nginx/default.conf /etc/nginx/conf.d/default.conf
 
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/service-website/nginx/default.conf b/service-website/nginx/default.conf
new file mode 100644
index 0000000..f2e8407
--- /dev/null
+++ b/service-website/nginx/default.conf
@@ -0,0 +1,45 @@
+server {
+    listen       8080;
+    server_name  localhost;
+
+    #charset koi8-r;
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+    #
+    #location ~ \.php$ {
+    #    proxy_pass   http://127.0.0.1;
+    #}
+
+    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+    #
+    #location ~ \.php$ {
+    #    root           html;
+    #    fastcgi_pass   127.0.0.1:9000;
+    #    fastcgi_index  index.php;
+    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+    #    include        fastcgi_params;
+    #}
+
+    # deny access to .htaccess files, if Apache's document root
+    # concurs with nginx's one
+    #
+    #location ~ /\.ht {
+    #    deny  all;
+    #}
+}
+
-- 
2.43.0