Skip to content

Commit bd2b071

Browse files
committed
#7 add back subfolder support
1 parent 264fb3b commit bd2b071

3 files changed

Lines changed: 10 additions & 154 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN \
1515
https://github.com/selkies-project/selkies.git \
1616
/src && \
1717
cd /src && \
18-
git checkout -f d25325c845b940dc69dca9996d07a8b56a64110e
18+
git checkout -f fbca920c47c216a1e16edb41112fa6caabfc0c7b
1919

2020
RUN \
2121
echo "**** build frontend ****" && \
@@ -185,7 +185,7 @@ RUN \
185185
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
186186
curl -o \
187187
/tmp/selkies.tar.gz -L \
188-
"https://github.com/selkies-project/selkies/archive/d25325c845b940dc69dca9996d07a8b56a64110e.tar.gz" && \
188+
"https://github.com/selkies-project/selkies/archive/fbca920c47c216a1e16edb41112fa6caabfc0c7b.tar.gz" && \
189189
cd /tmp && \
190190
tar xf selkies.tar.gz && \
191191
cd selkies-* && \

Dockerfile.aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN \
1515
https://github.com/selkies-project/selkies.git \
1616
/src && \
1717
cd /src && \
18-
git checkout -f d25325c845b940dc69dca9996d07a8b56a64110e
18+
git checkout -f fbca920c47c216a1e16edb41112fa6caabfc0c7b
1919

2020
RUN \
2121
echo "**** build frontend ****" && \
@@ -183,7 +183,7 @@ RUN \
183183
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
184184
curl -o \
185185
/tmp/selkies.tar.gz -L \
186-
"https://github.com/selkies-project/selkies/archive/d25325c845b940dc69dca9996d07a8b56a64110e.tar.gz" && \
186+
"https://github.com/selkies-project/selkies/archive/fbca920c47c216a1e16edb41112fa6caabfc0c7b.tar.gz" && \
187187
cd /tmp && \
188188
tar xf selkies.tar.gz && \
189189
cd selkies-* && \

root/defaults/default.conf

Lines changed: 6 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -3,58 +3,10 @@ server {
33
#auth_basic_user_file /etc/nginx/.htpasswd;
44
listen 3000 default_server;
55
listen [::]:3000 default_server;
6-
location / {
7-
root /usr/share/selkies/www/;
6+
location SUBFOLDER {
7+
alias /usr/share/selkies/www/;
88
index index.html index.htm;
9-
}
10-
location /devmode {
11-
proxy_set_header Upgrade $http_upgrade;
12-
proxy_set_header Connection "upgrade";
13-
proxy_set_header Host $host;
14-
proxy_set_header X-Real-IP $remote_addr;
15-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
16-
proxy_set_header X-Forwarded-Proto $scheme;
17-
proxy_http_version 1.1;
18-
proxy_read_timeout 3600s;
19-
proxy_send_timeout 3600s;
20-
proxy_connect_timeout 3600s;
21-
proxy_buffering off;
22-
client_max_body_size 10M;
23-
proxy_pass http://127.0.0.1:5173;
24-
}
25-
26-
location SUBFOLDERhealth {
27-
proxy_http_version 1.1;
28-
proxy_read_timeout 3600s;
29-
proxy_send_timeout 3600s;
30-
proxy_connect_timeout 3600s;
31-
proxy_buffering off;
32-
client_max_body_size 10M;
33-
proxy_pass http://127.0.0.1:8081;
34-
}
35-
location SUBFOLDERturn {
36-
proxy_http_version 1.1;
37-
proxy_read_timeout 3600s;
38-
proxy_send_timeout 3600s;
39-
proxy_connect_timeout 3600s;
40-
proxy_buffering off;
41-
client_max_body_size 10M;
42-
proxy_pass http://127.0.0.1:8081;
43-
}
44-
location SUBFOLDERws {
45-
proxy_set_header Upgrade $http_upgrade;
46-
proxy_set_header Connection "upgrade";
47-
proxy_set_header Host $host;
48-
proxy_set_header X-Real-IP $remote_addr;
49-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
50-
proxy_set_header X-Forwarded-Proto $scheme;
51-
proxy_http_version 1.1;
52-
proxy_read_timeout 3600s;
53-
proxy_send_timeout 3600s;
54-
proxy_connect_timeout 3600s;
55-
proxy_buffering off;
56-
client_max_body_size 10M;
57-
proxy_pass http://127.0.0.1:8081;
9+
try_files $uri $uri/ =404;
5810
}
5911
location SUBFOLDERwebsocket {
6012
proxy_set_header Upgrade $http_upgrade;
@@ -71,30 +23,6 @@ server {
7123
client_max_body_size 10M;
7224
proxy_pass http://127.0.0.1:8082;
7325
}
74-
location SUBFOLDERwebrtc/signalling {
75-
proxy_set_header Upgrade $http_upgrade;
76-
proxy_set_header Connection "upgrade";
77-
proxy_set_header Host $host;
78-
proxy_set_header X-Real-IP $remote_addr;
79-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
80-
proxy_set_header X-Forwarded-Proto $scheme;
81-
proxy_http_version 1.1;
82-
proxy_read_timeout 3600s;
83-
proxy_send_timeout 3600s;
84-
proxy_connect_timeout 3600s;
85-
proxy_buffering off;
86-
client_max_body_size 10M;
87-
proxy_pass http://127.0.0.1:8081;
88-
}
89-
location SUBFOLDERmetrics {
90-
proxy_http_version 1.1;
91-
proxy_read_timeout 3600s;
92-
proxy_send_timeout 3600s;
93-
proxy_connect_timeout 3600s;
94-
proxy_buffering off;
95-
client_max_body_size 10M;
96-
proxy_pass http://127.0.0.1:9081;
97-
}
9826
location SUBFOLDERfiles {
9927
fancyindex on;
10028
fancyindex_footer SUBFOLDERnginx/footer.html;
@@ -114,58 +42,10 @@ server {
11442
listen [::]:3001 ssl;
11543
ssl_certificate /config/ssl/cert.pem;
11644
ssl_certificate_key /config/ssl/cert.key;
117-
location / {
118-
root /usr/share/selkies/www/;
45+
location SUBFOLDER {
46+
alias /usr/share/selkies/www/;
11947
index index.html index.htm;
120-
}
121-
location /devmode {
122-
proxy_set_header Upgrade $http_upgrade;
123-
proxy_set_header Connection "upgrade";
124-
proxy_set_header Host $host;
125-
proxy_set_header X-Real-IP $remote_addr;
126-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
127-
proxy_set_header X-Forwarded-Proto $scheme;
128-
proxy_http_version 1.1;
129-
proxy_read_timeout 3600s;
130-
proxy_send_timeout 3600s;
131-
proxy_connect_timeout 3600s;
132-
proxy_buffering off;
133-
client_max_body_size 10M;
134-
proxy_pass http://127.0.0.1:5173;
135-
}
136-
137-
location SUBFOLDERhealth {
138-
proxy_http_version 1.1;
139-
proxy_read_timeout 3600s;
140-
proxy_send_timeout 3600s;
141-
proxy_connect_timeout 3600s;
142-
proxy_buffering off;
143-
client_max_body_size 10M;
144-
proxy_pass http://127.0.0.1:8081;
145-
}
146-
location SUBFOLDERturn {
147-
proxy_http_version 1.1;
148-
proxy_read_timeout 3600s;
149-
proxy_send_timeout 3600s;
150-
proxy_connect_timeout 3600s;
151-
proxy_buffering off;
152-
client_max_body_size 10M;
153-
proxy_pass http://127.0.0.1:8081;
154-
}
155-
location SUBFOLDERws {
156-
proxy_set_header Upgrade $http_upgrade;
157-
proxy_set_header Connection "upgrade";
158-
proxy_set_header Host $host;
159-
proxy_set_header X-Real-IP $remote_addr;
160-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
161-
proxy_set_header X-Forwarded-Proto $scheme;
162-
proxy_http_version 1.1;
163-
proxy_read_timeout 3600s;
164-
proxy_send_timeout 3600s;
165-
proxy_connect_timeout 3600s;
166-
proxy_buffering off;
167-
client_max_body_size 10M;
168-
proxy_pass http://127.0.0.1:8081;
48+
try_files $uri $uri/ =404;
16949
}
17050
location SUBFOLDERwebsocket {
17151
proxy_set_header Upgrade $http_upgrade;
@@ -182,30 +62,6 @@ server {
18262
client_max_body_size 10M;
18363
proxy_pass http://127.0.0.1:8082;
18464
}
185-
location SUBFOLDERwebrtc/signalling {
186-
proxy_set_header Upgrade $http_upgrade;
187-
proxy_set_header Connection "upgrade";
188-
proxy_set_header Host $host;
189-
proxy_set_header X-Real-IP $remote_addr;
190-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
191-
proxy_set_header X-Forwarded-Proto $scheme;
192-
proxy_http_version 1.1;
193-
proxy_read_timeout 3600s;
194-
proxy_send_timeout 3600s;
195-
proxy_connect_timeout 3600s;
196-
proxy_buffering off;
197-
client_max_body_size 10M;
198-
proxy_pass http://127.0.0.1:8081;
199-
}
200-
location SUBFOLDERmetrics {
201-
proxy_http_version 1.1;
202-
proxy_read_timeout 3600s;
203-
proxy_send_timeout 3600s;
204-
proxy_connect_timeout 3600s;
205-
proxy_buffering off;
206-
client_max_body_size 10M;
207-
proxy_pass http://127.0.0.1:9081;
208-
}
20965
location SUBFOLDERfiles {
21066
fancyindex on;
21167
fancyindex_footer SUBFOLDERnginx/footer.html;

0 commit comments

Comments
 (0)