IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-01-20 20:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

nginx fix for vue interface

Browse Source 
- localhost/vue resolves to frontend
- localhost:3000/vue resolves to frontend in development
- images are resolved properly
- remaining services are reachable as normal
- fixed image path to be relative instead of absolute
- cleaned nginx config
This commit is contained in:
Ulf Gebhardt 2021-04-28 03:19:33 +02:00
parent 4eb712e217
commit 4720391599
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
5 changed files with 30 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
community_server/webroot/.htaccess
View File

@ -1,5 +1,6 @@
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !^/vue
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^ index.php [L]
</IfModule>

1
frontend/src/routes/router.js
View File

@ -6,6 +6,7 @@ Vue.use(VueRouter)
// configure router
const router = new VueRouter({
base: '/vue',
routes, // short for routes: routes
linkActiveClass: 'active',
mode: 'history',

2
frontend/src/views/KontoOverview/GddSend.vue
View File

@ -10,7 +10,7 @@
<span class="alert-text" v-html="$t('form.scann_code')"></span>
<b-col v-show="!scan" lg="12" class="text-right">
<a @click="toggle" class="nav-link pointer">
<img src="/img/icons/gradido/qr-scan-pure.png" height="50" />
<img src="img/icons/gradido/qr-scan-pure.png" height="50" />
</a>
</b-col>

2
frontend/vue.config.js
View File

@ -15,7 +15,7 @@ module.exports = {
},
},
lintOnSave: true,
// publicPath: '/',
publicPath: '/vue',
configureWebpack: {
// Set up all the aliases we use in our app.
resolve: {

73
nginx/nginx.conf
View File

@ -1,5 +1,3 @@
server {
listen 80 ;
@ -8,12 +6,10 @@ server {
#include /etc/nginx/common/protect.conf;
#include /etc/nginx/common/protect_add_header.conf;
#include /etc/nginx/common/ssl.conf;
#include /etc/nginx/common/ssl.conf;
root /var/www/cakephp/webroot;
index index.php;
index index.php;
location ~ \.php$ {
fastcgi_pass community-server:9000;
@ -23,7 +19,6 @@ server {
fastcgi_buffers 16 16k;
fastcgi_buffer_size 32k;
include fastcgi_params;
}
location ~ /\.ht {
@ -31,65 +26,49 @@ server {
}
location /account {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_cache_bypass $http_upgrade;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $host;
rewrite /account/(.*) /$1 break;
#proxy_next_upstream error timeout invalid_header http_502 non_idempotent;
proxy_pass http://login-server:1200;
proxy_redirect off;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_cache_bypass $http_upgrade;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $host;
rewrite /account/(.*) /$1 break;
proxy_pass http://login-server:1200;
proxy_redirect off;
}
location /login_api {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_cache_bypass $http_upgrade;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $host;
rewrite /login_api/(.*) /$1 break;
proxy_pass http://login-server:1201;
proxy_redirect off;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_cache_bypass $http_upgrade;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $host;
rewrite /login_api/(.*) /$1 break;
proxy_pass http://login-server:1201;
proxy_redirect off;
}
location / {
try_files $uri $uri/ /index.php?$args;
try_files $uri $uri/ /index.php?$args;
}
location /vue {
location /vue/sockjs-node {
rewrite /vue/(.*) /$1;
}
location ~* \.(png) {
expires 1d;
rewrite /vue/(.*) /$1;
}
#try_files /vue/$uri /vue/$uri/ /index.html;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
#rewrite /vue/(.*) /$1 break;
proxy_pass http://frontend:8080;
proxy_pass http://frontend:3000;
proxy_redirect off;
}
# access_log /var/log/nginx/access.log main;
}