From 192d1414f2e930b0d2c64d7a625e800a682cfac1 Mon Sep 17 00:00:00 2001 From: karpenok Date: Thu, 12 Nov 2026 22:14:57 +0700 Subject: [PATCH] =?UTF-8?q?fix(opnsense):=20=D1=81=D1=80=D0=B0=D0=B2=D0=BD?= =?UTF-8?q?=D0=B8=D0=B2=D0=B0=D1=82=D1=8C=20loglevel=20OptionField=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D0=B2=D1=8B=D0=B1=D1=80=D0=B0=D0=BD=D0=BD=D0=BE?= =?UTF-8?q?=D0=B9=20=D0=BE=D0=BF=D1=86=D0=B8=D0=B8=20=D0=B2=20drift-=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/roles/opnsense/xray/tasks/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ansible/roles/opnsense/xray/tasks/main.yml b/ansible/roles/opnsense/xray/tasks/main.yml index 793e724..04f7abc 100644 --- a/ansible/roles/opnsense/xray/tasks/main.yml +++ b/ansible/roles/opnsense/xray/tasks/main.yml @@ -142,6 +142,10 @@ vars: cur: "{{ item.1.json.instance }}" want: "{{ xray_payloads[item.0.name] }}" + # loglevel — OptionField: getItem отдаёт не строку, а список опций + # с флагами selected. Вытаскиваем ключ выбранной опции. + cur_loglevel_sel: "{{ cur.loglevel | dict2items | default([]) | selectattr('value.selected', 'equalto', 1) | map(attribute='key') | list }}" + cur_loglevel: "{{ cur_loglevel_sel[0] if cur_loglevel_sel | length > 0 else '' }}" drift: >- {{ (cur.outbound_config | default('') | from_json) != (want.outbound_config | from_json) or cur.name != want.name @@ -151,7 +155,7 @@ or (cur.tun_interface | default('')) != want.tun_interface or (cur.mtu | string) != want.mtu or (cur.bypass_networks | default('')) != want.bypass_networks - or (cur.loglevel | default('')) != want.loglevel }} + or cur_loglevel != want.loglevel }} loop: "{{ xray_current.json.rows | default([]) | selectattr('name', 'in', xray_desired | map(attribute='name') | list) | list | zip(xray_existing.results) | list }}" loop_control: label: "{{ item.0.name }}"