Skip to content

Commit df02cdb

Browse files
tux-o-maticalessfg
andauthored
Fixes #28: Use port 8080 by default for status page (#29)
Co-authored-by: Alessandro Fael Garcia <[email protected]>
1 parent 0edd6e2 commit df02cdb

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
env:
1313
scenario: default
1414
- name: (CentOS/Debian/Ubuntu) Test config generation with NGINX Plus directives
15+
if: not (type = "pull_request" and fork = "true")
1516
env:
1617
scenario: plus
1718
- name: (Alpine Linux/CentOS/Debian/Ubuntu) Install stable branch and push a config

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## 0.3.0 (Unreleased)
4+
5+
BREAKING CHANGES:
6+
7+
* The default port of the status module is now 8080 and matches the CI molecule test which already used it. Set ```nginx_config_status_port```to another desired value.
8+
9+
BUG FIXES:
10+
11+
* Prevent TravisCI from trying to build (and failing) NGINX Plus images on external PRs.
12+
313
## 0.2.0 (September 24, 2020)
414

515
BREAKING CHANGES:

defaults/main/template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ nginx_config_status_enable: false
361361
nginx_config_status_template_file: http/status.conf.j2
362362
nginx_config_status_file_location: /etc/nginx/conf.d/status.conf
363363
nginx_config_status_log: false
364-
nginx_config_status_port: 80
364+
nginx_config_status_port: 8080
365365
nginx_config_status_allow: 127.0.0.1
366366
nginx_config_status_deny: all
367367

templates/http/status.conf.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{{ ansible_managed | comment }}
22

33
server {
4-
listen {{ nginx_config_status_port | default('80') }};
4+
listen {{ nginx_config_status_port | default('8080') }};
55
access_log {{ nginx_config_status_log | ternary('on', 'off') }};
66
location /nginx_status {
77
stub_status on;
8+
}
89
{% if nginx_config_status_allow is defined %}
9-
allow {{ nginx_config_status_allow }};
10+
allow {{ nginx_config_status_allow }};
1011
{% endif %}
1112
{% if nginx_config_status_deny is defined %}
12-
deny {{ nginx_config_status_deny }};
13+
deny {{ nginx_config_status_deny }};
1314
{% endif %}
14-
}
1515
}

0 commit comments

Comments
 (0)