Merge pull request #6 from HanXHX/tryfiles

Add feature: override_try_files on vhost
pull/14/head
Emilien Mantel 2015-10-17 08:14:12 +02:00
commit bf1b9950cb
4 changed files with 4 additions and 2 deletions

View File

@ -61,6 +61,7 @@ You can see many examples in: [tests/test.yml](tests/test.yml).
- `location`: (O) Add new custom locations (it does not overwrite!) - `location`: (O) Add new custom locations (it does not overwrite!)
- `more`: (O) Add more custom infos. - `more`: (O) Add more custom infos.
- `upstream_params`: (O) Add upstream params (useful when you want to pass variables to PHP) - `upstream_params`: (O) Add upstream params (useful when you want to pass variables to PHP)
- `override_try_files`: (O) overrides default try\_files defined in template
(O) : Optional (O) : Optional
(M) : Mandatory (M) : Mandatory

View File

@ -30,7 +30,7 @@ server {
location / { location / {
{% block template_try_files %} {% block template_try_files %}
try_files $uri $uri/ =404; try_files {{ override_try_files | default('$uri $uri/ =404') }};
{% endblock %} {% endblock %}
} }

View File

@ -4,7 +4,7 @@
{% endblock %} {% endblock %}
{% block template_try_files %} {% block template_try_files %}
try_files $uri $uri/ /index.php; try_files {{ override_try_files | default('$uri $uri/ /index.php') }};
{% endblock %} {% endblock %}
{% block template_upstream_location %} {% block template_upstream_location %}

View File

@ -21,6 +21,7 @@
- 'test-alias.local' - 'test-alias.local'
- 'test2-alias.local' - 'test2-alias.local'
template: '_base' template: '_base'
override_try_files: '$uri $uri index.htm index.html'
more: more:
- 'autoindex off;' - 'autoindex off;'
location: location: