diff --git a/.deploy/nginx-rebuild.conf b/.deploy/nginx-rebuild.conf index 84d4d5bac..f49229b21 100644 --- a/.deploy/nginx-rebuild.conf +++ b/.deploy/nginx-rebuild.conf @@ -1,26 +1,23 @@ # include nginx-rebuild.conf server { - server_name YOUR_DOMAIN; - listen 80; - # HTTPS - #listen 443 ssl http2; - #ssl_certificate /pathto/ssl.crt; - #ssl_certificate_key /pathto/ssl.key; - # PROXY - proxy_redirect http:// $scheme://; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - location / { - proxy_pass http://localhost:18080; - etag on; - } - location /assets { - proxy_pass http://localhost:18080/assets; - expires 90d; - } - #location /h5app { - # alias /pathto/public/h5app; - # etag on; - #} + server_name YOUR_DOMAIN; + listen 80; + # HTTPS + #listen 443 ssl http2; + #ssl_certificate /path/to/ssl.crt; + #ssl_certificate_key /path/to/ssl.key; + # PROXY + proxy_redirect http:// $scheme://; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + location / { + proxy_pass http://127.0.0.1:18080; + etag on; + } + location /h5app { + alias /path/to/public/h5app; + try_files $uri $uri/ /h5app/index.html; + etag on; + } } diff --git a/.gitignore b/.gitignore index 47412033f..41c374639 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,7 @@ node .DS_Store test.* + +# Build + +**/public/h5app/ diff --git a/@rbv b/@rbv index d242b9288..28379ae7d 160000 --- a/@rbv +++ b/@rbv @@ -1 +1 @@ -Subproject commit d242b9288b4fc5595f3757f71f58d6b8055de339 +Subproject commit 28379ae7d7f3d76b203f889f877ec7b6deb690b7 diff --git a/src/main/resources/public/h5app/index.html b/src/main/resources/public/h5app/index.html index dbd797929..5cd0a0453 100644 --- a/src/main/resources/public/h5app/index.html +++ b/src/main/resources/public/h5app/index.html @@ -2,6 +2,7 @@
+