web_*: cleanup, add VXoWG api endpoint
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Markus 2020-11-24 20:29:53 +01:00
parent e8435cdd9b
commit 3baf4139ac
3 changed files with 11 additions and 7 deletions

View File

@ -19,8 +19,6 @@ yanic_database_delete_after: 720d
yanic_dbc_repondd_enable: false yanic_dbc_repondd_enable: false
nginx_ssl: true
yanic_influxdb: yanic_influxdb:
- enable: true - enable: true
host: http://127.0.0.1:8086 host: http://127.0.0.1:8086

View File

@ -13,6 +13,11 @@ server {
root /var/www/html; root /var/www/html;
# VXoWG broker API
location /api {
proxy_pass http://localhost:8000/api;
}
# temp redirector server # temp redirector server
location /move.php { location /move.php {
proxy_pass http://home.mephis.to:2342/move.php; proxy_pass http://home.mephis.to:2342/move.php;
@ -25,6 +30,7 @@ server {
location /firmware-ng/stable { location /firmware-ng/stable {
proxy_pass http://home.mephis.to:2342/ff/stable/images; proxy_pass http://home.mephis.to:2342/ff/stable/images;
} }
# post 11s # post 11s
location /firmware-11s/experimental { location /firmware-11s/experimental {
proxy_pass http://home.mephis.to:2342/ff/11s/experimental/images; proxy_pass http://home.mephis.to:2342/ff/11s/experimental/images;
@ -54,6 +60,7 @@ server {
location /firmware-ng/stable { location /firmware-ng/stable {
proxy_pass http://home.mephis.to:2342/ff/stable/images; proxy_pass http://home.mephis.to:2342/ff/stable/images;
} }
# post 11s # post 11s
location /firmware-11s/experimental { location /firmware-11s/experimental {
proxy_pass http://home.mephis.to:2342/ff/11s/experimental/images; proxy_pass http://home.mephis.to:2342/ff/11s/experimental/images;

View File

@ -2,14 +2,13 @@ server {
listen 80; listen 80;
listen [::]:80; listen [::]:80;
proxy_set_header X-Forwarded-For $remote_addr;
server_name _; server_name _;
location /.well-known/acme-challenge { location /.well-known/acme-challenge {
default_type "text/plain"; default_type "text/plain";
alias /var/www/acme-challenge; alias /var/www/acme-challenge;
} }
root /var/www/html; root /var/www/html;
} }
@ -18,8 +17,6 @@ server {
listen 443 ssl http2; listen 443 ssl http2;
listen [::]:443 ssl http2; listen [::]:443 ssl http2;
proxy_set_header X-Forwarded-For $remote_addr;
server_name {{ ansible_fqdn }}; server_name {{ ansible_fqdn }};
ssl_certificate_key /etc/nginx/ssl/{{ ansible_fqdn }}.key; ssl_certificate_key /etc/nginx/ssl/{{ ansible_fqdn }}.key;
@ -28,8 +25,10 @@ server {
root /var/www/html; root /var/www/html;
location / { location / {
proxy_pass http://localhost:3000/ proxy_pass http://localhost:3000/;
proxy_set_header X-Forwarded-For $remote_addr;
} }
location /meshviewer { location /meshviewer {
alias /var/www/html/meshviewer; alias /var/www/html/meshviewer;
} }