Skip to content

Commit c349901

Browse files
authored
Fix rewrite option in modules template (#193)
1 parent a28ff60 commit c349901

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ BUG FIXES:
99
* NGINX listen `so_keepalive` parameter was not working as intended when setting specific values.
1010
* Make sure all template objects are properly transformed into strings before doing Jinja2 operations.
1111
* Remove unnecessary parentheses.
12+
* Fix rewrite option in modules template.
1213

1314
## 0.4.1 (October 25, 2021)
1415

molecule/default/verify.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,12 @@
8282
check_mode: true
8383
register: conf
8484
failed_when: (conf is changed) or (conf is failed)
85+
86+
- name: Ensure default.conf contains 'rewrite (.*).html(.*) $1$2 last;'
87+
lineinfile:
88+
path: /etc/nginx/conf.d/default.conf
89+
line: " rewrite (.*).html(.*) $1$2 last;"
90+
state: present
91+
check_mode: true
92+
register: conf
93+
failed_when: (conf is changed) or (conf is failed)

templates/http/modules.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ open_log_file_cache {{ 'off' if not log['open_log_file_cache'] else ('max=' + lo
199199
return {{ rewrite['return'] if (rewrite['return'] is string or rewrite['return'] is number) }}{{ rewrite['return']['code'] if rewrite['return']['code'] is defined }}{{ (' ' + rewrite['return']['text'] | string) if rewrite['return']['text'] is defined }}{{ (' ' + rewrite['return']['url'] | string) if rewrite['return']['url'] is defined }};
200200
{% endif %}
201201
{% if rewrite['rewrites'] is defined %}{# 'rewrite' directive is not available in the 'http' context #}
202-
{% for rewrite in rewrite['rewrites'] if (rewrite['rewrites'] is sequence and rewrite['rewrites'] is not string) %}
202+
{% for rewrite in rewrite['rewrites'] if (rewrite['rewrites'] is not mapping and rewrite['rewrites'] is not string) %}
203203
rewrite {{ rewrite['regex'] }} {{ rewrite['replacement'] }}{{ (' ' + rewrite['flag'] | string) if rewrite['flag'] is defined and rewrite['flag'] in ['last', 'break', 'redirect', 'permanent'] }};
204204
{% endfor %}
205205
{% endif %}

0 commit comments

Comments
 (0)