diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2017-05-07 19:23:32 +0200 |
|---|---|---|
| committer | ArthurHoaro <arthur@hoa.ro> | 2017-05-07 19:23:32 +0200 |
| commit | fcf141926da98a4a656a785df991858819961319 (patch) | |
| tree | 049c1ff6b770e759ca7a96b30e6476b9f18cbfa3 /docker/development | |
| parent | 8868f3ca461011a8fb6dd9f90b60ed697ab52fc5 (diff) | |
| parent | 54c8e8d2998c5ab5ffd08ae8f1fa11276773c16c (diff) | |
| download | Shaarli-fcf141926da98a4a656a785df991858819961319.tar.gz Shaarli-fcf141926da98a4a656a785df991858819961319.tar.zst Shaarli-fcf141926da98a4a656a785df991858819961319.zip | |
Merge tag 'v0.9.0' into latest
Release v0.9.0
Diffstat (limited to 'docker/development')
| -rw-r--r-- | docker/development/nginx.conf | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docker/development/nginx.conf b/docker/development/nginx.conf index ac0c6c61..79c45bfe 100644 --- a/docker/development/nginx.conf +++ b/docker/development/nginx.conf | |||
| @@ -56,7 +56,16 @@ http { | |||
| 56 | alias /var/www/shaarli/images/favicon.ico; | 56 | alias /var/www/shaarli/images/favicon.ico; |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | location / { | ||
| 60 | # Slim - rewrite URLs | ||
| 61 | try_files $uri /index.php$is_args$args; | ||
| 62 | } | ||
| 63 | |||
| 59 | location ~ (index)\.php$ { | 64 | location ~ (index)\.php$ { |
| 65 | # Slim - split URL path into (script_filename, path_info) | ||
| 66 | try_files $uri =404; | ||
| 67 | fastcgi_split_path_info ^(.+\.php)(/.+)$; | ||
| 68 | |||
| 60 | # filter and proxy PHP requests to PHP-FPM | 69 | # filter and proxy PHP requests to PHP-FPM |
| 61 | fastcgi_pass unix:/var/run/php5-fpm.sock; | 70 | fastcgi_pass unix:/var/run/php5-fpm.sock; |
| 62 | fastcgi_index index.php; | 71 | fastcgi_index index.php; |