Skip to content

Commit 3b6cd4c

Browse files
Williangalvanijoaoantoniocardoso
Williangalvani
authored and
joaoantoniocardoso
committed
core: remove nginx redirects
1 parent 462b156 commit 3b6cd4c

File tree

1 file changed

+38
-58
lines changed

1 file changed

+38
-58
lines changed

‎core/tools/nginx/nginx.conf‎

Lines changed: 38 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -55,82 +55,71 @@ http {
5555

5656
location /ardupilot-manager {
5757
include cors.conf;
58-
rewrite ^/ardupilot-manager$ /ardupilot-manager/ redirect;
59-
rewrite ^/ardupilot-manager/(.*)$ /$1 break;
60-
proxy_pass http://localhost:8000;
58+
rewrite ^/ardupilot-manager(/|$)(.*)$ /$2 break;
59+
proxy_pass http://127.0.0.1:8000;
6160
}
6261

6362
location /bag {
6463
include cors.conf;
65-
rewrite ^/bag$ /bag/ redirect;
66-
rewrite ^/bag/(.*)$ /$1 break;
67-
proxy_pass http://localhost:9101;
64+
rewrite ^/bag(/|$)(.*)$ /$2 break;
65+
proxy_pass http://127.0.0.1:9101;
6866
}
6967

7068
location /beacon {
7169
include cors.conf;
72-
rewrite ^/beacon$ /beacon/ redirect;
73-
rewrite ^/beacon/(.*)$ /$1 break;
74-
proxy_pass http://localhost:9111;
70+
rewrite ^/beacon(/|$)(.*)$ /$2 break;
71+
proxy_pass http://127.0.0.1:9111;
7572
proxy_set_header X-Real-IP $remote_addr;
7673
proxy_set_header X-Interface-Ip $server_addr;
7774
}
7875

7976
location /bridget {
8077
include cors.conf;
81-
rewrite ^/bridget$ /bridget/ redirect;
82-
rewrite ^/bridget/(.*)$ /$1 break;
83-
proxy_pass http://localhost:27353;
78+
rewrite ^/bridget(/|$)(.*)$ /$2 break;
79+
proxy_pass http://127.0.0.1:27353;
8480
}
8581

8682
location /cable-guy {
8783
include cors.conf;
88-
rewrite ^/cable-guy$ /cable-guy/ redirect;
89-
rewrite ^/cable-guy/(.*)$ /$1 break;
90-
proxy_pass http://localhost:9090;
84+
rewrite ^/cable-guy(/|$)(.*)$ /$2 break;
85+
proxy_pass http://127.0.0.1:9090;
9186
}
9287

9388
location /commander {
9489
include cors.conf;
95-
rewrite ^/commander$ /commander/ redirect;
96-
rewrite ^/commander/(.*)$ /$1 break;
97-
proxy_pass http://localhost:9100;
90+
rewrite ^/commander(/|$)(.*)$ /$2 break;
91+
proxy_pass http://127.0.0.1:9100;
9892
}
9993

10094
location /docker {
10195
limit_except GET {
10296
deny all;
10397
}
104-
rewrite ^/docker$ /docker/ redirect;
105-
rewrite ^/docker/(.*)$ /$1 break;
98+
rewrite ^/docker(/|$)(.*)$ /$2 break;
10699
proxy_pass http://unix:/var/run/docker.sock:/;
107100
}
108101

109102
location /file-browser {
110-
rewrite ^/file-browser$ /file-browser/ redirect;
111-
rewrite ^/file-browser/(.*)$ /$1 break;
112-
proxy_pass http://localhost:7777;
103+
rewrite ^/file-browser(/|$)(.*)$ /$2 break;
104+
proxy_pass http://127.0.0.1:7777;
113105
}
114106

115107
location /helper {
116108
include cors.conf;
117-
rewrite ^/helper$ /helper/ redirect;
118-
rewrite ^/helper/(.*)$ /$1 break;
119-
proxy_pass http://localhost:81;
109+
rewrite ^/helper(/|$)(.*)$ /$2 break;
110+
proxy_pass http://127.0.0.1:81;
120111
}
121112

122113
location /kraken {
123114
include cors.conf;
124-
rewrite ^/kraken$ /kraken/ redirect;
125-
rewrite ^/kraken/(.*)$ /$1 break;
126-
proxy_pass http://localhost:9134;
115+
rewrite ^/kraken(/|$)(.*)$ /$2 break;
116+
proxy_pass http://127.0.0.1:9134;
127117
}
128118

129119
location /nmea-injector {
130120
include cors.conf;
131-
rewrite ^/nmea-injector$ /nmea-injector/ redirect;
132-
rewrite ^/nmea-injector/(.*)$ /$1 break;
133-
proxy_pass http://localhost:2748;
121+
rewrite ^/nmea-injector(/|$)(.*)$ /$2 break;
122+
proxy_pass http://127.0.0.1:2748;
134123
}
135124

136125
location ^~ /logviewer {
@@ -144,9 +133,8 @@ http {
144133
proxy_hide_header Access-Control-Allow-Origin;
145134

146135
include cors.conf;
147-
rewrite ^/mavlink2rest$ /mavlink2rest/ redirect;
148-
rewrite ^/mavlink2rest/(.*)$ /$1 break;
149-
proxy_pass http://localhost:6040;
136+
rewrite ^/mavlink2rest(/|$)(.*)$ /$2 break;
137+
proxy_pass http://127.0.0.1:6040;
150138
# next two lines are required for websockets
151139
proxy_set_header Upgrade $http_upgrade;
152140
proxy_set_header Connection "Upgrade";
@@ -157,8 +145,7 @@ http {
157145
proxy_hide_header Access-Control-Allow-Origin;
158146

159147
include cors.conf;
160-
rewrite ^/webrtc$ /webrtc/ redirect;
161-
rewrite ^/webrtc/(.*)$ /$1 break;
148+
rewrite ^//webrtc/ws(/|$)(.*)$ /$2 break;
162149
proxy_pass http://127.0.0.1:6021;
163150
proxy_http_version 1.1;
164151
# next two lines are required for websockets
@@ -168,62 +155,55 @@ http {
168155

169156
location /mavlink-camera-manager {
170157
include cors.conf;
171-
rewrite ^/mavlink-camera-manager$ /mavlink-camera-manager/ redirect;
172-
rewrite ^/mavlink-camera-manager/(.*)$ /$1 break;
173-
proxy_pass http://localhost:6020;
158+
rewrite ^/mavlink-camera-manager(/|$)(.*)$ /$2 break;
159+
proxy_pass http://127.0.0.1:6020;
174160
}
175161

176162
location /network-test {
177163
include cors.conf;
178-
rewrite ^/network-test$ /network-test/ redirect;
179-
rewrite ^/network-test/(.*)$ /$1 break;
180-
proxy_pass http://localhost:9120;
164+
rewrite ^/network-test(/|$)(.*)$ /$2 break;
165+
proxy_pass http://127.0.0.1:9120;
181166
# next two lines are required for websockets
182167
proxy_set_header Upgrade $http_upgrade;
183168
proxy_set_header Connection "Upgrade";
184169
}
185170

186171
location /system-information {
187172
include cors.conf;
188-
rewrite ^/system-information$ /system-information/ redirect;
189-
rewrite ^/system-information/(.*)$ /$1 break;
190-
proxy_pass http://localhost:6030;
173+
rewrite ^/system-information(/|$)(.*)$ /$2 break;
174+
proxy_pass http://127.0.0.1:6030;
191175
# next two lines are required for websockets
192176
proxy_set_header Upgrade $http_upgrade;
193177
proxy_set_header Connection "Upgrade";
194178
}
195179

196180
location /terminal {
197-
rewrite ^/terminal$ /terminal/ redirect;
198-
rewrite ^/terminal/(.*)$ /$1 break;
199-
proxy_pass http://localhost:8088;
181+
rewrite ^/terminal(/|$)(.*)$ /$2 break;
182+
proxy_pass http://127.0.0.1:8088;
200183
# next two lines are required for websockets
201184
proxy_set_header Upgrade $http_upgrade;
202185
proxy_set_header Connection "Upgrade";
203186
}
204187

205188
location /version-chooser {
206189
include cors.conf;
207-
rewrite ^/version-chooser$ /version-chooser/ redirect;
208-
rewrite ^/version-chooser/(.*)$ /$1 break;
209-
proxy_pass http://localhost:8081;
190+
rewrite ^/version-chooser(/|$)(.*)$ /$2 break;
191+
proxy_pass http://127.0.0.1:8081;
210192
proxy_buffering off;
211193
expires -1;
212194
add_header Cache-Control no-store;
213195
}
214196

215197
location /wifi-manager {
216198
include cors.conf;
217-
rewrite ^/wifi-manager$ /wifi-manager/ redirect;
218-
rewrite ^/wifi-manager/(.*)$ /$1 break;
219-
proxy_pass http://localhost:9000;
199+
rewrite ^/wifi-manager(/|$)(.*)$ /$2 break;
200+
proxy_pass http://127.0.0.1:9000;
220201
}
221202

222203
location /ping {
223204
include cors.conf;
224-
rewrite ^/ping$ /ping/ redirect;
225-
rewrite ^/ping/(.*)$ /$1 break;
226-
proxy_pass http://localhost:9110;
205+
rewrite ^/ping(/|$)(.*)$ /$2 break;
206+
proxy_pass http://127.0.0.1:9110;
227207
}
228208

229209
location / {

0 commit comments

Comments
 (0)