refactor: restructure inventory, split roles and add new services
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
invalid_xray_set_{{ name }}
|
||||
{% endif %}
|
||||
{% endmacro %}
|
||||
{% for item in groups[xray_managed_group] | default([]) | sort %}
|
||||
{% for item in xray_managed_group | default([]) | sort %}
|
||||
{% set client = hostvars[item] %}
|
||||
{% if client.xray_policy is defined %}
|
||||
{% set src_ip = client.container_ip %}
|
||||
|
||||
@@ -4,7 +4,7 @@ set {{ id }}_ip {
|
||||
type ipv4_addr
|
||||
flags interval
|
||||
auto-merge
|
||||
include "{{ xray_lists_global.output_dir }}/{{ id }}.elements.nft"
|
||||
include "{{ xray_lists_global.output_dir }}/{{ id }}_ip.elements.nft"
|
||||
}
|
||||
{% endfor -%}
|
||||
{%- for id, item in xray_domain_sets.items() -%}
|
||||
|
||||
@@ -6,9 +6,9 @@ global:
|
||||
{% if xray_lists_global.proxy is defined %}
|
||||
proxy: "{{ xray_lists_global.proxy }}"
|
||||
{% endif %}
|
||||
{% if xray_lists_global.proxy_user is defined %}
|
||||
proxy_user: "{{ xray_lists_global.proxy_user }}"
|
||||
proxy_pass: "{{ xray_lists_global.proxy_pass }}"
|
||||
{% if proxy_user is defined %}
|
||||
proxy_user: "{{ proxy_user }}"
|
||||
proxy_pass: "{{ proxy_pass }}"
|
||||
{% endif %}
|
||||
http_timeout: {{ xray_lists_global.http_timeout | default(20) }}
|
||||
ip_sets:
|
||||
|
||||
Reference in New Issue
Block a user