From 7fa4b4ce63757b8ff3807be332313687edb249b5 Mon Sep 17 00:00:00 2001
From: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Thu, 6 May 2021 09:46:51 +0200
Subject: [PATCH] Testing to add nginx.conf inside application source

---
 angular.json                 |  2 +-
 apps/dafa-web/src/nginx.conf | 86 ++++++++++++++++++++++++++++++++++++
 openshift/dev/Jenkinsfile    |  5 +--
 3 files changed, 88 insertions(+), 5 deletions(-)
 create mode 100644 apps/dafa-web/src/nginx.conf

diff --git a/angular.json b/angular.json
index c58e00f..80f99de 100644
--- a/angular.json
+++ b/angular.json
@@ -48,7 +48,7 @@
             "polyfills": "apps/dafa-web/src/polyfills.ts",
             "tsConfig": "apps/dafa-web/tsconfig.app.json",
             "aot": true,
-            "assets": ["apps/dafa-web/src/assets"],
+            "assets": ["apps/dafa-web/src/assets", "src/nginx.conf"],
             "styles": ["apps/dafa-web/src/styles/styles.scss"],
             "stylePreprocessorOptions": {
               "includePaths": ["apps/dafa-web/src/styles"]
diff --git a/apps/dafa-web/src/nginx.conf b/apps/dafa-web/src/nginx.conf
new file mode 100644
index 0000000..4cbc100
--- /dev/null
+++ b/apps/dafa-web/src/nginx.conf
@@ -0,0 +1,86 @@
+# 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/openshift/dev/Jenkinsfile b/openshift/dev/Jenkinsfile
index 74bb4e6..3c861bd 100644
--- a/openshift/dev/Jenkinsfile
+++ b/openshift/dev/Jenkinsfile
@@ -90,16 +90,13 @@ 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 nginx/nginx.conf ${NGINX_PATH}
           #cp -r nginx/* ${NGINX_PATH}
         '''