chore: Fixes nginx routing for the design-system app.

dynatrace-oss · Jul 7, 2020 · 5fa82b0 · 5fa82b0
1 parent 138cb87
commit 5fa82b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.deployment/barista/Jenkinsfile b/.deployment/barista/Jenkinsfile
@@ -147,7 +147,7 @@ pipeline {
                   # Build next section of the design system
                   node \
                   --max_old_space_size=8192 \
-                  ./node_modules/.bin/ng run next:build:production-internal
+                  ./node_modules/.bin/ng run next:build:production-internal --base-href='/next/'
                 fi
 
                 cat dist/barista-data/routes.txt

diff --git a/.deployment/barista/nginx/sites-available/barista-internal.conf b/.deployment/barista/nginx/sites-available/barista-internal.conf
@@ -5,7 +5,6 @@ server {
   server_name localhost;
 
   index index.html;
-  root /var/www/barista;
 
   # security headers
   add_header X-Frame-Options "SAMEORIGIN" always;
@@ -19,12 +18,15 @@ server {
     deny all;
   }
 
-  # location /next {
-  #   root /var/www/next;
-  #   try_files $uri $uri/ /index.html;
-  # }
+  location ~ ^/next(/)? {
+    root /var/www/next/;
+    # https://stackoverflow.com/a/41629576
+    rewrite  ^/next/(.*) /$1 break;
+    try_files $uri /next/index.html;
+  }
 
-  location / {
+  location ~ / {
+    root /var/www/barista;
 		try_files $uri $uri/ /index.html;
 	}