Merge branch 'master' into develop

- Updated new develop version label
- Incremented database build number
This commit is contained in:
Hypolite Petovan 2018-06-01 07:30:04 -04:00
commit 93daf7883e
474 changed files with 75160 additions and 91301 deletions

View file

@ -82,27 +82,22 @@ server {
# rewrite to front controller as default rule
location / {
if ($is_args != "") {
rewrite ^/(.*) /index.php?pagename=$uri&$args last;
if (!-e $request_filename) {
rewrite ^(.*)$ /index.php?pagename=$1;
}
rewrite ^/(.*) /index.php?pagename=$uri last;
}
# make sure webfinger and other well known services aren't blocked
# by denying dot files and rewrite request to the front controller
location ^~ /.well-known/ {
allow all;
rewrite ^/(.*) /index.php?pagename=$uri&$args last;
}
# statically serve these file types when possible
# otherwise fall back to front controller
# allow browser to cache them
# added .htm for advanced source code editor library
location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|ttf|woff|svg)$ {
expires 30d;
try_files $uri /index.php?pagename=$uri&$args;
if (!-e $request_filename) {
rewrite ^(.*)$ /index.php?pagename=$1;
}
}
include mime.types;
# block these file types
location ~* \.(tpl|md|tgz|log|out)$ {
@ -126,8 +121,8 @@ server {
# With php5-cgi alone:
# fastcgi_pass 127.0.0.1:9000;
# With php5-fpm:
fastcgi_pass unix:/var/run/php5-fpm.sock;
# With php7.0-fpm:
fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
include fastcgi_params;
fastcgi_index index.php;