From 2b84413ba0c69c43087e1a107eae96934265401f Mon Sep 17 00:00:00 2001
From: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Tue, 11 May 2021 14:17:27 +0200
Subject: [PATCH] Updated nginx version inside nginx.conf

---
 apps/dafa-web/src/nginx.conf | 86 ------------------------------------
 nginx/nginx.conf             | 12 ++---
 openshift/dev/Jenkinsfile    |  7 ++-
 3 files changed, 11 insertions(+), 94 deletions(-)
 delete mode 100644 apps/dafa-web/src/nginx.conf

diff --git a/apps/dafa-web/src/nginx.conf b/apps/dafa-web/src/nginx.conf
deleted file mode 100644
index 4cbc100..0000000
--- a/apps/dafa-web/src/nginx.conf
+++ /dev/null
@@ -1,86 +0,0 @@
-# For more information on configuration, see:
-#   * Official English Documentation: http://nginx.org/en/docs/
-#   * Official Russian Documentation: http://nginx.org/ru/docs/
-
-
-worker_processes    auto;
-error_log           /var/opt/rh/rh-nginx112/log/nginx/error.log;
-pid                 /var/opt/rh/rh-nginx112/run/nginx/nginx.pid;
-
-# Load dynamic modules. See /opt/rh/rh-nginx112/root/usr/share/doc/README.dynamic.
-include             /opt/rh/rh-nginx112/root/usr/share/nginx/modules/*.conf;
-
-events {
-    worker_connections  1024;
-}
-
-http {
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log      /var/opt/rh/rh-nginx112/log/nginx/access.log  main;
-
-    sendfile            on;
-    tcp_nopush          on;
-    tcp_nodelay         on;
-    keepalive_timeout   65;
-    types_hash_max_size 2048;
-
-    gzip on;
-    gzip_types application/xml application/json text/css text/javascript application/javascript;
-    gzip_vary on;
-    gzip_comp_level 6;
-    gzip_min_length 500;
-
-    include             /etc/opt/rh/rh-nginx112/nginx/mime.types;
-    default_type        application/octet-stream;
-
-    # Load modular configuration files from the /etc/nginx/conf.d directory.
-    # See http://nginx.org/en/docs/ngx_core_module.html#include
-    # for more information.
-    include             /opt/app-root/etc/nginx.d/*.conf;
-
-    server {
-        listen          8080 default_server;
-        listen          [::]:8080 default_server;
-        server_name     _;
-        root            /opt/app-root/src;
-
-        # Load configuration files for the default server block.
-        include         /opt/app-root/etc/nginx.default.d/*.conf;
-
-        location / {
-            try_files $uri $uri/ /index.html;
-            expires -1;
-        }
-
-        location ~* \.(?:jpg|jpeg|gif|png|ico|woff2)$ {
-            expires 1M;
-            add_header Cache-Control "public";
-        }
-
-        location ~* \.(?:js|json|css)$ {
-            add_header Cache-Control "no-cache, public, must-revalidate, proxy-revalidate";
-        }
-
-        # underscores_in_headers on;
-        # $RESOLVER
-
-        # # JWT TOKEN
-        # location /token/jwt/rest/idp/v0/dafa {
-        #   proxy_pass $JWT_URL;
-        # }
-
-
-        error_page 404 /404.html;
-        location = /40x.html {
-
-        }
-
-        error_page 500 502 503 504  /50x.html;
-        location = /50x.html {
-
-        }
-    }
-}
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 4cbc100..1b8d0eb 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -4,11 +4,11 @@
 
 
 worker_processes    auto;
-error_log           /var/opt/rh/rh-nginx112/log/nginx/error.log;
-pid                 /var/opt/rh/rh-nginx112/run/nginx/nginx.pid;
+error_log           /var/opt/rh/rh-nginx116/log/nginx/error.log;
+pid                 /var/opt/rh/rh-nginx116/run/nginx/nginx.pid;
 
-# Load dynamic modules. See /opt/rh/rh-nginx112/root/usr/share/doc/README.dynamic.
-include             /opt/rh/rh-nginx112/root/usr/share/nginx/modules/*.conf;
+# Load dynamic modules. See /opt/rh/rh-nginx116/root/usr/share/doc/README.dynamic.
+include             /opt/rh/rh-nginx116/root/usr/share/nginx/modules/*.conf;
 
 events {
     worker_connections  1024;
@@ -19,7 +19,7 @@ http {
                       '$status $body_bytes_sent "$http_referer" '
                       '"$http_user_agent" "$http_x_forwarded_for"';
 
-    access_log      /var/opt/rh/rh-nginx112/log/nginx/access.log  main;
+    access_log      /var/opt/rh/rh-nginx116/log/nginx/access.log  main;
 
     sendfile            on;
     tcp_nopush          on;
@@ -33,7 +33,7 @@ http {
     gzip_comp_level 6;
     gzip_min_length 500;
 
-    include             /etc/opt/rh/rh-nginx112/nginx/mime.types;
+    include             /etc/opt/rh/rh-nginx116/nginx/mime.types;
     default_type        application/octet-stream;
 
     # Load modular configuration files from the /etc/nginx/conf.d directory.
diff --git a/openshift/dev/Jenkinsfile b/openshift/dev/Jenkinsfile
index 37a1dc5..51931be 100644
--- a/openshift/dev/Jenkinsfile
+++ b/openshift/dev/Jenkinsfile
@@ -92,14 +92,17 @@ pipeline {
     }
 
     stage("Build application") {
+      environment {
+        NGINX_PATH = "${dist_path}/."
+      }
       steps {
         echo '### Building application... ###'
 
          sh '''
            npm run build:pega
 
-          #cp nginx/nginx.conf ${NGINX_PATH}
-          cp -r nginx/* ${NGINX_PATH}
+          cp nginx/nginx.conf ${NGINX_PATH}
+          #cp -r nginx/* ${NGINX_PATH}
         '''
 
         echo '### Application built! ###'