Skip to content

Commit 2e74ab6

Browse files
WilliangalvaniWilliangalvani
committed
core: remove nginx redirects
1 parent f7e2c37 commit 2e74ab6

File tree

1 file changed

+20
-40
lines changed

1 file changed

+20
-40
lines changed

‎core/tools/nginx/nginx.conf‎

Lines changed: 20 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -53,81 +53,70 @@ http {
5353

5454
location /ardupilot-manager {
5555
include cors.conf;
56-
rewrite ^/ardupilot-manager$ /ardupilot-manager/ redirect;
57-
rewrite ^/ardupilot-manager/(.*)$ /$1 break;
56+
rewrite ^/ardupilot-manager(/|$)(.*)$ /$2 break;
5857
proxy_pass http://127.0.0.1:8000;
5958
}
6059

6160
location /bag {
6261
include cors.conf;
63-
rewrite ^/bag$ /bag/ redirect;
64-
rewrite ^/bag/(.*)$ /$1 break;
62+
rewrite ^/bag(/|$)(.*)$ /$2 break;
6563
proxy_pass http://127.0.0.1:9101;
6664
}
6765

6866
location /beacon {
6967
include cors.conf;
70-
rewrite ^/beacon$ /beacon/ redirect;
71-
rewrite ^/beacon/(.*)$ /$1 break;
68+
rewrite ^/beacon(/|$)(.*)$ /$2 break;
7269
proxy_pass http://127.0.0.1:9111;
7370
proxy_set_header X-Real-IP $remote_addr;
7471
proxy_set_header X-Interface-Ip $server_addr;
7572
}
7673

7774
location /bridget {
7875
include cors.conf;
79-
rewrite ^/bridget$ /bridget/ redirect;
80-
rewrite ^/bridget/(.*)$ /$1 break;
76+
rewrite ^/bridget(/|$)(.*)$ /$2 break;
8177
proxy_pass http://127.0.0.1:27353;
8278
}
8379

8480
location /cable-guy {
8581
include cors.conf;
86-
rewrite ^/cable-guy$ /cable-guy/ redirect;
87-
rewrite ^/cable-guy/(.*)$ /$1 break;
82+
rewrite ^/cable-guy(/|$)(.*)$ /$2 break;
8883
proxy_pass http://127.0.0.1:9090;
8984
}
9085

9186
location /commander {
9287
include cors.conf;
93-
rewrite ^/commander$ /commander/ redirect;
94-
rewrite ^/commander/(.*)$ /$1 break;
88+
rewrite ^/commander(/|$)(.*)$ /$2 break;
9589
proxy_pass http://127.0.0.1:9100;
9690
}
9791

9892
location /docker {
9993
limit_except GET {
10094
deny all;
10195
}
102-
rewrite ^/docker$ /docker/ redirect;
103-
rewrite ^/docker/(.*)$ /$1 break;
96+
rewrite ^/docker(/|$)(.*)$ /$2 break;
10497
proxy_pass http://unix:/var/run/docker.sock:/;
10598
}
10699

107100
location /file-browser {
108-
rewrite ^/file-browser$ /file-browser/ redirect;
109-
rewrite ^/file-browser/(.*)$ /$1 break;
101+
rewrite ^/file-browser(/|$)(.*)$ /$2 break;
110102
proxy_pass http://127.0.0.1:7777;
111103
}
112104

113105
location /helper {
114106
include cors.conf;
115-
rewrite ^/helper$ /helper/ redirect;
116-
rewrite ^/helper/(.*)$ /$1 break;
107+
rewrite ^/helper(/|$)(.*)$ /$2 break;
117108
proxy_pass http://127.0.0.1:81;
118109
}
119110

120111
location /kraken {
121112
include cors.conf;
122-
rewrite ^/kraken$ /kraken/ redirect;
123-
rewrite ^/kraken/(.*)$ /$1 break;
113+
rewrite ^/kraken(/|$)(.*)$ /$2 break;
124114
proxy_pass http://127.0.0.1:9134;
125115
}
126116

127117
location /nmea-injector {
128118
include cors.conf;
129-
rewrite ^/nmea-injector$ /nmea-injector/ redirect;
130-
rewrite ^/nmea-injector/(.*)$ /$1 break;
119+
rewrite ^/nmea-injector(/|$)(.*)$ /$2 break;
131120
proxy_pass http://127.0.0.1:2748;
132121
}
133122

@@ -142,8 +131,7 @@ http {
142131
proxy_hide_header Access-Control-Allow-Origin;
143132

144133
include cors.conf;
145-
rewrite ^/mavlink2rest$ /mavlink2rest/ redirect;
146-
rewrite ^/mavlink2rest/(.*)$ /$1 break;
134+
rewrite ^/mavlink2rest(/|$)(.*)$ /$2 break;
147135
proxy_pass http://127.0.0.1:6040;
148136
# next two lines are required for websockets
149137
proxy_set_header Upgrade $http_upgrade;
@@ -155,8 +143,7 @@ http {
155143
proxy_hide_header Access-Control-Allow-Origin;
156144

157145
include cors.conf;
158-
rewrite ^/webrtc$ /webrtc/ redirect;
159-
rewrite ^/webrtc/(.*)$ /$1 break;
146+
rewrite ^//webrtc/ws(/|$)(.*)$ /$2 break;
160147
proxy_pass http://127.0.0.1:6021;
161148
proxy_http_version 1.1;
162149
# next two lines are required for websockets
@@ -166,15 +153,13 @@ http {
166153

167154
location /mavlink-camera-manager {
168155
include cors.conf;
169-
rewrite ^/mavlink-camera-manager$ /mavlink-camera-manager/ redirect;
170-
rewrite ^/mavlink-camera-manager/(.*)$ /$1 break;
156+
rewrite ^/mavlink-camera-manager(/|$)(.*)$ /$2 break;
171157
proxy_pass http://127.0.0.1:6020;
172158
}
173159

174160
location /network-test {
175161
include cors.conf;
176-
rewrite ^/network-test$ /network-test/ redirect;
177-
rewrite ^/network-test/(.*)$ /$1 break;
162+
rewrite ^/network-test(/|$)(.*)$ /$2 break;
178163
proxy_pass http://127.0.0.1:9120;
179164
# next two lines are required for websockets
180165
proxy_set_header Upgrade $http_upgrade;
@@ -183,17 +168,15 @@ http {
183168

184169
location /system-information {
185170
include cors.conf;
186-
rewrite ^/system-information$ /system-information/ redirect;
187-
rewrite ^/system-information/(.*)$ /$1 break;
171+
rewrite ^/system-information(/|$)(.*)$ /$2 break;
188172
proxy_pass http://127.0.0.1:6030;
189173
# next two lines are required for websockets
190174
proxy_set_header Upgrade $http_upgrade;
191175
proxy_set_header Connection "Upgrade";
192176
}
193177

194178
location /terminal {
195-
rewrite ^/terminal$ /terminal/ redirect;
196-
rewrite ^/terminal/(.*)$ /$1 break;
179+
rewrite ^/terminal(/|$)(.*)$ /$2 break;
197180
proxy_pass http://127.0.0.1:8088;
198181
# next two lines are required for websockets
199182
proxy_set_header Upgrade $http_upgrade;
@@ -202,8 +185,7 @@ http {
202185

203186
location /version-chooser {
204187
include cors.conf;
205-
rewrite ^/version-chooser$ /version-chooser/ redirect;
206-
rewrite ^/version-chooser/(.*)$ /$1 break;
188+
rewrite ^/version-chooser(/|$)(.*)$ /$2 break;
207189
proxy_pass http://127.0.0.1:8081;
208190
proxy_buffering off;
209191
expires -1;
@@ -212,15 +194,13 @@ http {
212194

213195
location /wifi-manager {
214196
include cors.conf;
215-
rewrite ^/wifi-manager$ /wifi-manager/ redirect;
216-
rewrite ^/wifi-manager/(.*)$ /$1 break;
197+
rewrite ^/wifi-manager(/|$)(.*)$ /$2 break;
217198
proxy_pass http://127.0.0.1:9000;
218199
}
219200

220201
location /ping {
221202
include cors.conf;
222-
rewrite ^/ping$ /ping/ redirect;
223-
rewrite ^/ping/(.*)$ /$1 break;
203+
rewrite ^/ping(/|$)(.*)$ /$2 break;
224204
proxy_pass http://127.0.0.1:9110;
225205
}
226206

0 commit comments

Comments
 (0)