Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Always_run is deprecated #161 #162

Closed
wants to merge 2 commits into from
Closed

Always_run is deprecated #161 #162

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04cd82e
Always_run is deprecated #161
Feb 6, 2017
433f587
Add stream configuration #160
Feb 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add stream configuration #160
  • Loading branch information
Jérôme Avond committed Feb 6, 2017
commit 433f5879647358313d2d2d9f647cb1076613d626
2 changes: 1 addition & 1 deletion tasks/configuration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@
with_dict: "{{ nginx_stream_configs }}"
notify:
- reload nginx
when: nginx_official_repo_mainline
when: nginx_stream_params is defined and nginx_stream_configs is defined
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nginx_stream_params and nginx_stream_configs are always defined (they are defined in defaults/main.yml).
We have to check if there are not an empty list for nginx_stream_params or not an empty map for nginx_stream_configs

2 changes: 1 addition & 1 deletion templates/nginx.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ http {
include {{ nginx_conf_dir }}/sites-enabled/*;
}

{% if nginx_official_repo_mainline %}
{% if nginx_stream_params or nginx_stream_params %}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as previous comment

stream {

{% for v in nginx_stream_params %}
Expand Down