add support for generic streams
This commit is contained in:
parent
4d82b39ef9
commit
41841311e6
4 changed files with 48 additions and 0 deletions
|
|
@ -9,6 +9,7 @@ nginx:
|
||||||
snakeoil_default: false
|
snakeoil_default: false
|
||||||
upstreams: {}
|
upstreams: {}
|
||||||
vhosts: {}
|
vhosts: {}
|
||||||
|
streams: {}
|
||||||
maps: {}
|
maps: {}
|
||||||
resolver:
|
resolver:
|
||||||
- 8.8.8.8
|
- 8.8.8.8
|
||||||
|
|
@ -44,6 +45,13 @@ nginx_vhosts_defaults:
|
||||||
hide_proxy_headers: {}
|
hide_proxy_headers: {}
|
||||||
backend: ~
|
backend: ~
|
||||||
|
|
||||||
|
nginx_streams_defaults:
|
||||||
|
listen:
|
||||||
|
custom: []
|
||||||
|
includes: []
|
||||||
|
proxy_pass: ~
|
||||||
|
proxy_protocol: "off"
|
||||||
|
|
||||||
nginx_forcessl_vhost:
|
nginx_forcessl_vhost:
|
||||||
"https-redirect":
|
"https-redirect":
|
||||||
listen:
|
listen:
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ worker_processes auto;
|
||||||
pid /run/nginx.pid;
|
pid /run/nginx.pid;
|
||||||
|
|
||||||
load_module /usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so;
|
load_module /usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so;
|
||||||
|
load_module /usr/lib/nginx/modules/ngx_stream_module.so;
|
||||||
|
|
||||||
events {
|
events {
|
||||||
use epoll;
|
use epoll;
|
||||||
|
|
@ -36,3 +37,8 @@ http {
|
||||||
##
|
##
|
||||||
include /etc/nginx/sites-enabled/*;
|
include /etc/nginx/sites-enabled/*;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stream {
|
||||||
|
include /etc/nginx/conf.d/upstreams.conf;
|
||||||
|
include /etc/nginx/streams/*;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@
|
||||||
pkg:
|
pkg:
|
||||||
- nginx
|
- nginx
|
||||||
- libnginx-mod-http-headers-more-filter
|
- libnginx-mod-http-headers-more-filter
|
||||||
|
- libnginx-mod-stream
|
||||||
- goaccess
|
- goaccess
|
||||||
notify:
|
notify:
|
||||||
- delete nginx index.nginx-debian.html
|
- delete nginx index.nginx-debian.html
|
||||||
|
|
@ -83,6 +84,17 @@
|
||||||
notify:
|
notify:
|
||||||
- restart nginx
|
- restart nginx
|
||||||
|
|
||||||
|
- name: create and enable nginx streams
|
||||||
|
template:
|
||||||
|
src: stream.conf.j2
|
||||||
|
dest: "/etc/nginx/streams/{{ item.key }}"
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: 0644
|
||||||
|
with_dict: "{{ {}|combine(nginx.streams, recursive=True) }}"
|
||||||
|
notify:
|
||||||
|
- restart nginx
|
||||||
|
|
||||||
- name: delete nginx default config
|
- name: delete nginx default config
|
||||||
file: path=/etc/nginx/sites-enabled/default state=absent
|
file: path=/etc/nginx/sites-enabled/default state=absent
|
||||||
|
|
||||||
|
|
|
||||||
22
templates/stream.conf.j2
Normal file
22
templates/stream.conf.j2
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
#jinja2:lstrip_blocks: True
|
||||||
|
{% set stream = {}|combine(nginx_streams_defaults, item.value, recursive=True) %}
|
||||||
|
{% set stream_name = item.key %}
|
||||||
|
|
||||||
|
server {
|
||||||
|
|
||||||
|
{% for i in stream.listen.custom %}
|
||||||
|
listen {{ i }};
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
proxy_pass {{ stream.proxy_pass }};
|
||||||
|
proxy_protocol {{ stream.proxy_protocol }};
|
||||||
|
|
||||||
|
{% for c in stream.custom|default([]) %}
|
||||||
|
{{ c }};
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% for include in stream.includes %}
|
||||||
|
include {{ include }};
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue