Skip to content

Commit 81e8566

Browse files
authored
Update README, set yamllint version, add rewrite to tests (#24)
* Update the README to point to the main branch instead of master * Explicitly set the yamllint version in Travis * Add the rewrite directive to the tests (solves #9)
1 parent 2ee8e8d commit 81e8566

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ before_install:
3838
install:
3939
- pip install ansible==2.9.13
4040
- pip install ansible-lint==4.3.4
41+
- pip install yamllint==1.24.2
4142
- pip install molecule==3.0.8
4243
- pip install docker==4.3.1
4344
script:

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,18 @@ Role Variables
108108
109109
This role has multiple variables. The descriptions and defaults for all these variables can be found in the **`defaults/main`** directory in the following files:
110110

111-
- **[defaults/main/main.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/master/defaults/main/main.yml):** NGINX simple config variables
112-
- **[defaults/main/template.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/master/defaults/main/template.yml):** NGINX config template variables
113-
- **[defaults/main/upload.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/master/defaults/main/upload.yml):** NGINX config/HTML/SSL upload variables
111+
- **[defaults/main/main.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/defaults/main/main.yml):** NGINX simple config variables
112+
- **[defaults/main/template.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/defaults/main/template.yml):** NGINX config template variables
113+
- **[defaults/main/upload.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/defaults/main/upload.yml):** NGINX config/HTML/SSL upload variables
114114

115115
Example Playbooks
116116
-----------------
117117

118118
Working functional playbook examples can be found in the **`molecule/common`** directory in the following files:
119119

120-
- **[molecule/common/playbooks/cleanup_module_converge.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/master/molecule/common/playbooks/cleanup_module_converge.yml):** Cleanup an NGINX config and configure NGINX supported modules
121-
- **[molecule/common/playbooks/default_converge.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/master/molecule/common/playbooks/default_converge.yml):** Use the NGINX config templating variables to create an NGINX config
122-
- **[molecule/common/playbooks/stable_push_converge.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/master/molecule/common/playbooks/stable_push_converge.yml):** Install NGINX using the stable branch and push a preexisting config from your system to your NGINX instance
120+
- **[molecule/common/playbooks/cleanup_module_converge.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/molecule/common/playbooks/cleanup_module_converge.yml):** Cleanup an NGINX config and configure NGINX supported modules
121+
- **[molecule/common/playbooks/default_converge.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/molecule/common/playbooks/default_converge.yml):** Use the NGINX config templating variables to create an NGINX config
122+
- **[molecule/common/playbooks/stable_push_converge.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/molecule/common/playbooks/stable_push_converge.yml):** Install NGINX using the stable branch and push a preexisting config from your system to your NGINX instance
123123

124124
Do note that if you install this repository via Ansible Galaxy, you will have to replace the role variable in the sample playbooks from `ansible-role-nginx-config` to `nginxinc.nginx_config`.
125125

@@ -133,7 +133,7 @@ You can find an Ansible role to help you install and configure NGINX App Protect
133133
License
134134
-------
135135

136-
[Apache License, Version 2.0](https://github.com/nginxinc/ansible-role-nginx-config/blob/master/LICENSE)
136+
[Apache License, Version 2.0](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/LICENSE)
137137

138138
Author Information
139139
------------------

molecule/common/playbooks/default_converge.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
# sub_filters: []
4747
last_modified: "off"
4848
once: "on"
49-
types: "text/html"
49+
# types: "text/html"
5050
http_global_autoindex: false
5151
custom_options:
5252
- master_process on;
@@ -112,7 +112,7 @@
112112
# sub_filters: []
113113
last_modified: "off"
114114
once: "on"
115-
types: "text/html"
115+
# types: "text/html"
116116
# custom_options: []
117117
reverse_proxy:
118118
locations:
@@ -129,6 +129,8 @@
129129
name: Fancy-New-Header-To-Test
130130
value: testing=true
131131
always: false
132+
rewrites:
133+
- (.*).html(.*) $1$2
132134
proxy_pass: http://frontend_servers/
133135
proxy_cache: frontend_proxy_cache
134136
proxy_cache_valid:
@@ -167,7 +169,7 @@
167169
# sub_filters: []
168170
last_modified: "off"
169171
once: "on"
170-
types: "text/html"
172+
# types: "text/html"
171173
backend:
172174
location: /backend
173175
proxy_pass: http://backend_servers/
@@ -294,7 +296,7 @@
294296
- "'proxied_for_ip' '$http_x_forwarded_for'"
295297
last_modified: "off"
296298
once: "off"
297-
types: "text/html"
299+
# types: "text/html"
298300
web_server:
299301
locations:
300302
frontend_site:
@@ -308,7 +310,7 @@
308310
# sub_filters: []
309311
last_modified: "off"
310312
once: "off"
311-
types: "text/html"
313+
# types: "text/html"
312314
http_demo_conf: false
313315
backend:
314316
template_file: http/default.conf.j2
@@ -337,7 +339,7 @@
337339
- "'proxied_for_ip' '$http_x_forwarded_for'"
338340
last_modified: "off"
339341
once: "off"
340-
types: "text/html"
342+
# types: "text/html"
341343
web_server:
342344
locations:
343345
backend_site:
@@ -363,7 +365,7 @@
363365
# sub_filters: []
364366
last_modified: "off"
365367
once: "off"
366-
types: "text/html"
368+
# types: "text/html"
367369
http_demo_conf: false
368370
nginx_config_html_demo_template_enable: true
369371
nginx_config_html_demo_template:

0 commit comments

Comments
 (0)