Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
vidjil
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1,696
Issues
1,696
List
Boards
Labels
Service Desk
Milestones
Merge Requests
89
Merge Requests
89
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vidjil
vidjil
Commits
d10b65f3
Commit
d10b65f3
authored
Jun 12, 2020
by
marc duez
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nginx config : store server/client locations in separate files
parent
22aa3527
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
138 deletions
+51
-138
docker/vidjil-client/conf/client_location.conf
docker/vidjil-client/conf/client_location.conf
+33
-0
docker/vidjil-client/conf/nginx_web2py
docker/vidjil-client/conf/nginx_web2py
+3
-68
docker/vidjil-client/conf/nginx_web2py_http
docker/vidjil-client/conf/nginx_web2py_http
+3
-70
docker/vidjil-client/conf/server_location.conf
docker/vidjil-client/conf/server_location.conf
+12
-0
No files found.
docker/vidjil-client/conf/client_location.conf
0 → 100644
View file @
d10b65f3
location
/ {
root
/
usr
/
share
/
vidjil
/
browser
;
rewrite
^/([
0
-
9
]+)-([
0
-
9
]+)/(
css
|
js
|
image
|
test
)/(.*) /$
3
/$
4
redirect
;
rewrite
^/([
0
-
9
]+)-([
0
-
9
]+)/ /?
set
=$
1
&
config
=$
2
redirect
;
rewrite
^/([
0
-
9
]+)-([
0
-
9
]+) /?
set
=$
1
&
config
=$
2
redirect
;
expires
1
h
;
add_header
Cache
-
Control
must
-
revalidate
;
error_page
405
= $
uri
;
}
location
/
browser
{
root
/
usr
/
share
/
vidjil
;
rewrite
^/
browser
/([
0
-
9
]+)-([
0
-
9
]+)/(
css
|
js
|
image
|
test
)/(.*) /
browser
/$
3
/$
4
redirect
;
rewrite
^/
browser
/([
0
-
9
]+)-([
0
-
9
]+)/ /
browser
/?
set
=$
1
&
config
=$
2
redirect
;
rewrite
^/
browser
/([
0
-
9
]+)-([
0
-
9
]+) /
browser
/?
set
=$
1
&
config
=$
2
redirect
;
expires
1
h
;
add_header
Cache
-
Control
must
-
revalidate
;
error_page
405
= $
uri
;
}
location
/
germline
{
root
/
usr
/
share
/
vidjil
/;
expires
1
h
;
add_header
Cache
-
Control
must
-
revalidate
;
error_page
405
= $
uri
;
}
docker/vidjil-client/conf/nginx_web2py
View file @
d10b65f3
...
...
@@ -24,73 +24,8 @@ server {
keepalive_timeout 70;
uwsgi_max_temp_file_size 20480m;
location ~ ^/(vidjil|admin) {
include /etc/nginx/conf.d/web2py/uwsgi.conf;
proxy_read_timeout 600;
client_max_body_size 20G;
###
}
location / {
root /usr/share/vidjil/browser;
rewrite ^/([0-9]+)-([0-9]+)/(css|js|image|test)/(.*) /$3/$4 redirect;
rewrite ^/([0-9]+)-([0-9]+)/ /?set=$1&config=$2 redirect;
rewrite ^/([0-9]+)-([0-9]+) /?set=$1&config=$2 redirect;
expires 1h;
add_header Cache-Control must-revalidate;
error_page 405 = $uri;
}
location /browser {
root /usr/share/vidjil;
rewrite ^/browser/([0-9]+)-([0-9]+)/(css|js|image|test)/(.*) /browser/$3/$4 redirect;
rewrite ^/browser/([0-9]+)-([0-9]+)/ /browser/?set=$1&config=$2 redirect;
rewrite ^/browser/([0-9]+)-([0-9]+) /browser/?set=$1&config=$2 redirect;
expires 1h;
add_header Cache-Control must-revalidate;
error_page 405 = $uri;
}
location /germline {
root /usr/share/vidjil/;
expires 1h;
add_header Cache-Control must-revalidate;
error_page 405 = $uri;
}
###to enable correct use of response.static_version
#location ~* ^/(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ {
# alias /usr/share/vidjil/server/web2py/applications/$1/static/$2;
# expires max;
#
#}
###
client_max_body_size 20G;
location /cgi/ {
gzip off;
root /usr/share/vidjil/browser/;
# Fastcgi socket
fastcgi_pass unix:/var/run/fcgiwrap.socket;
# Fastcgi parameters, include the standard ones
include /etc/nginx/fastcgi_params;
# Adjust non standard parameters (SCRIPT_FILENAME)
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
}
location /vidjil/file/upload {
include /etc/nginx/conf.d/web2py/uwsgi.conf;
uwsgi_read_timeout 10m;
client_max_body_size 20G;
}
include /etc/vidjil/server_location.conf;
include /etc/vidjil/client_location.conf;
}
docker/vidjil-client/conf/nginx_web2py_http
View file @
d10b65f3
...
...
@@ -7,75 +7,8 @@ server {
keepalive_timeout 70;
uwsgi_max_temp_file_size 20480m;
location ~ ^/(vidjil|admin) {
include /etc/nginx/conf.d/web2py/uwsgi.conf;
proxy_read_timeout 600;
client_max_body_size 20G;
###
}
## if you serve static files through https, copy here the section
## from the previous server instance to manage static files
location / {
root /usr/share/vidjil/browser;
rewrite ^/([0-9]+)-([0-9]+)/(css|js|image|test)/(.*) /$3/$4 redirect;
rewrite ^/([0-9]+)-([0-9]+)/ /?set=$1&config=$2 redirect;
rewrite ^/([0-9]+)-([0-9]+) /?set=$1&config=$2 redirect;
expires 1h;
add_header Cache-Control must-revalidate;
error_page 405 = $uri;
}
location /browser {
root /usr/share/vidjil;
rewrite ^/browser/([0-9]+)-([0-9]+)/(css|js|image|test)/(.*) /browser/$3/$4 redirect;
rewrite ^/browser/([0-9]+)-([0-9]+)/ /browser/?set=$1&config=$2 redirect;
rewrite ^/browser/([0-9]+)-([0-9]+) /browser/?set=$1&config=$2 redirect;
expires 1h;
add_header Cache-Control must-revalidate;
error_page 405 = $uri;
}
location /germline {
root /usr/share/vidjil/;
expires 1h;
add_header Cache-Control must-revalidate;
error_page 405 = $uri;
}
###to enable correct use of response.static_version
#location ~* ^/(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ {
# alias /usr/share/vidjil/server/web2py/applications/$1/static/$2;
# expires max;
#
#}
###
client_max_body_size 20G;
location /cgi/ {
gzip off;
root /usr/share/vidjil/browser/;
# Fastcgi socket
fastcgi_pass unix:/var/run/fcgiwrap.socket;
# Fastcgi parameters, include the standard ones
include /etc/nginx/fastcgi_params;
# Adjust non standard parameters (SCRIPT_FILENAME)
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
}
location /vidjil/file/upload {
include /etc/nginx/conf.d/web2py/uwsgi.conf;
uwsgi_read_timeout 10m;
client_max_body_size 20G;
}
include /etc/vidjil/server_location.conf;
include /etc/vidjil/client_location.conf;
}
docker/vidjil-client/conf/server_location.conf
0 → 100644
View file @
d10b65f3
location
~ ^/(
vidjil
|
admin
) {
include
/
etc
/
nginx
/
conf
.
d
/
web2py
/
uwsgi
.
conf
;
proxy_read_timeout
600
;
client_max_body_size
20
G
;
###
}
location
/
vidjil
/
file
/
upload
{
include
/
etc
/
nginx
/
conf
.
d
/
web2py
/
uwsgi
.
conf
;
uwsgi_read_timeout
10
m
;
client_max_body_size
20
G
;
}
\ No newline at end of file
Mikaël Salson
@mikael-s
mentioned in issue
#4431 (closed)
·
Jul 29, 2020
mentioned in issue
#4431 (closed)
mentioned in issue #4431
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment