From fec773d8e5723d2be4d12ebd858e63cae5a38106 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Mon, 5 May 2025 19:05:46 +0200 Subject: [PATCH] fix: formatter --- .../010/dictionaries/firefox/00-proxy.yml | 2 + .../011/dictionaries/firefox/00-proxy.yml | 2 + .../012/dictionaries/firefox/00-proxy.yml | 2 + .../013/dictionaries/firefox/00-proxy.yml | 2 + .../014/dictionaries/firefox/00-proxy.yml | 2 + .../020/dictionaries/firefox/10-manual.yml | 2 + .../021/dictionaries/firefox/10-manual.yml | 2 + .../022/dictionaries/firefox/10-manual.yml | 2 + .../023/dictionaries/firefox/10-manual.yml | 2 + .../024/dictionaries/firefox/10-manual.yml | 2 + .../025/dictionaries/firefox/10-manual.yml | 2 + .../026/dictionaries/firefox/10-manual.yml | 2 + .../027/dictionaries/firefox/10-manual.yml | 2 + .../028/dictionaries/firefox/10-manual.yml | 2 + .../029/dictionaries/firefox/10-manual.yml | 2 + .../030/dictionaries/firefox/20-manual.yml | 2 + .../031/dictionaries/firefox/20-manual.yml | 2 + .../032/dictionaries/firefox/20-manual.yml | 2 + .../033/dictionaries/firefox/20-manual.yml | 2 + .../034/dictionaries/firefox/20-manual.yml | 2 + .../035/dictionaries/firefox/20-manual.yml | 2 + .../036/dictionaries/firefox/20-manual.yml | 2 + .../040/dictionaries/firefox/20-manual.yml | 2 + .../041/dictionaries/firefox/20-manual.yml | 2 + .../042/dictionaries/firefox/20-manual.yml | 2 + .../043/dictionaries/firefox/20-manual.yml | 2 + .../044/dictionaries/firefox/20-manual.yml | 2 + .../050/dictionaries/firefox/10-manual.yml | 4 +- .../051/dictionaries/firefox/20-manual.yml | 26 +++--- examples/060/dictionaries/firefox/30-auto.yml | 2 + examples/061/dictionaries/firefox/30-auto.yml | 2 + .../070/dictionaries/firefox/40-no_proxy.yml | 4 +- .../071/dictionaries/firefox/40-no_proxy.yml | 4 +- .../072/dictionaries/firefox/40-no_proxy.yml | 4 +- .../073/dictionaries/firefox/40-no_proxy.yml | 12 ++- .../074/dictionaries/firefox/40-no_proxy.yml | 14 +-- .../firefox/50-prompt_authentication.yml | 2 + .../firefox/55-proxy_dns_socks5.yml | 2 + .../firefox/55-proxy_dns_socks5.yml | 8 +- .../firefox/55-proxy_dns_socks5.yml | 10 +- .../firefox/60-dns_over_https.yml | 2 + .../firefox/60-dns_over_https.yml | 2 + .../firefox/60-dns_over_https.yml | 6 +- .../firefox/60-dns_over_https.yml | 18 ++-- .../090/dictionaries/firefox/00-proxy.yml | 2 + .../090/dictionaries/firefox/10-manual.yml | 4 +- .../090/dictionaries/firefox/20-manual.yml | 2 + examples/090/dictionaries/firefox/30-auto.yml | 2 + .../090/dictionaries/firefox/40-no_proxy.yml | 14 +-- .../firefox/50-prompt_authentication.yml | 2 + .../firefox/55-proxy_dns_socks5.yml | 10 +- .../firefox/60-dns_over_https.yml | 18 ++-- .../091/dictionaries/firefox/20-manual.yml | 26 +++--- .../dictionaries/foxyproxy/00-foxyproxy.yml | 5 +- .../dictionaries/foxyproxy/00-foxyproxy.yml | 11 ++- .../dictionaries/foxyproxy/00-foxyproxy.yml | 11 ++- .../dictionaries/foxyproxy/00-foxyproxy.yml | 93 +++++++++++++------ .../dictionaries/foxyproxy/10-redefine.yml | 8 +- 58 files changed, 268 insertions(+), 116 deletions(-) diff --git a/examples/010/dictionaries/firefox/00-proxy.yml b/examples/010/dictionaries/firefox/00-proxy.yml index e468d85..12f129a 100644 --- a/examples/010/dictionaries/firefox/00-proxy.yml +++ b/examples/010/dictionaries/firefox/00-proxy.yml @@ -1,2 +1,4 @@ +%YAML 1.2 --- proxy_mode: +... diff --git a/examples/011/dictionaries/firefox/00-proxy.yml b/examples/011/dictionaries/firefox/00-proxy.yml index 0299903..28a4cad 100644 --- a/examples/011/dictionaries/firefox/00-proxy.yml +++ b/examples/011/dictionaries/firefox/00-proxy.yml @@ -1,3 +1,5 @@ +%YAML 1.2 --- proxy_mode: description: Configure Proxy Access to the Internet +... diff --git a/examples/012/dictionaries/firefox/00-proxy.yml b/examples/012/dictionaries/firefox/00-proxy.yml index 9d7618a..ce5db5a 100644 --- a/examples/012/dictionaries/firefox/00-proxy.yml +++ b/examples/012/dictionaries/firefox/00-proxy.yml @@ -1,4 +1,6 @@ +%YAML 1.2 --- proxy_mode: description: Configure Proxy Access to the Internet default: No proxy +... diff --git a/examples/013/dictionaries/firefox/00-proxy.yml b/examples/013/dictionaries/firefox/00-proxy.yml index 0272c72..2cb6687 100644 --- a/examples/013/dictionaries/firefox/00-proxy.yml +++ b/examples/013/dictionaries/firefox/00-proxy.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- proxy_mode: description: Configure Proxy Access to the Internet @@ -9,3 +10,4 @@ proxy_mode: - Manual proxy configuration - Automatic proxy configuration URL default: No proxy +... diff --git a/examples/014/dictionaries/firefox/00-proxy.yml b/examples/014/dictionaries/firefox/00-proxy.yml index 41f5978..b7a8bcb 100644 --- a/examples/014/dictionaries/firefox/00-proxy.yml +++ b/examples/014/dictionaries/firefox/00-proxy.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- proxy_mode: description: Configure Proxy Access to the Internet @@ -8,3 +9,4 @@ proxy_mode: - Manual proxy configuration - Automatic proxy configuration URL default: No proxy +... diff --git a/examples/020/dictionaries/firefox/10-manual.yml b/examples/020/dictionaries/firefox/10-manual.yml index 8a704f5..ef2132c 100644 --- a/examples/020/dictionaries/firefox/10-manual.yml +++ b/examples/020/dictionaries/firefox/10-manual.yml @@ -1,4 +1,6 @@ +%YAML 1.2 --- manual: description: Manual proxy configuration type: family +... diff --git a/examples/021/dictionaries/firefox/10-manual.yml b/examples/021/dictionaries/firefox/10-manual.yml index 44560e6..82d385d 100644 --- a/examples/021/dictionaries/firefox/10-manual.yml +++ b/examples/021/dictionaries/firefox/10-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: description: Manual proxy configuration @@ -6,3 +7,4 @@ manual: http_proxy: description: HTTP Proxy type: family +... diff --git a/examples/022/dictionaries/firefox/10-manual.yml b/examples/022/dictionaries/firefox/10-manual.yml index b71f9ce..56431b3 100644 --- a/examples/022/dictionaries/firefox/10-manual.yml +++ b/examples/022/dictionaries/firefox/10-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: description: Manual proxy configuration @@ -9,3 +10,4 @@ manual: address: description: HTTP address +... diff --git a/examples/023/dictionaries/firefox/10-manual.yml b/examples/023/dictionaries/firefox/10-manual.yml index 5a37092..0af22a3 100644 --- a/examples/023/dictionaries/firefox/10-manual.yml +++ b/examples/023/dictionaries/firefox/10-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: description: Manual proxy configuration @@ -7,3 +8,4 @@ manual: address: description: HTTP address +... diff --git a/examples/024/dictionaries/firefox/10-manual.yml b/examples/024/dictionaries/firefox/10-manual.yml index 01c7ae0..ae7cdf4 100644 --- a/examples/024/dictionaries/firefox/10-manual.yml +++ b/examples/024/dictionaries/firefox/10-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: description: Manual proxy configuration @@ -8,3 +9,4 @@ manual: address: description: HTTP address type: domainname +... diff --git a/examples/025/dictionaries/firefox/10-manual.yml b/examples/025/dictionaries/firefox/10-manual.yml index a199bc6..5609c9b 100644 --- a/examples/025/dictionaries/firefox/10-manual.yml +++ b/examples/025/dictionaries/firefox/10-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: description: Manual proxy configuration @@ -10,3 +11,4 @@ manual: type: domainname params: allow_ip: true +... diff --git a/examples/026/dictionaries/firefox/10-manual.yml b/examples/026/dictionaries/firefox/10-manual.yml index 3cfe16c..9e89737 100644 --- a/examples/026/dictionaries/firefox/10-manual.yml +++ b/examples/026/dictionaries/firefox/10-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: description: Manual proxy configuration @@ -15,3 +16,4 @@ manual: description: HTTP Port type: port default: 8080 +... diff --git a/examples/027/dictionaries/firefox/10-manual.yml b/examples/027/dictionaries/firefox/10-manual.yml index 0b16451..1b7d9e0 100644 --- a/examples/027/dictionaries/firefox/10-manual.yml +++ b/examples/027/dictionaries/firefox/10-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: description: Manual proxy configuration @@ -16,3 +17,4 @@ manual: description: HTTP Port type: port default: 8080 +... diff --git a/examples/028/dictionaries/firefox/10-manual.yml b/examples/028/dictionaries/firefox/10-manual.yml index 695773e..af258e2 100644 --- a/examples/028/dictionaries/firefox/10-manual.yml +++ b/examples/028/dictionaries/firefox/10-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: description: Manual proxy configuration @@ -19,3 +20,4 @@ manual: description: HTTP Port type: port default: 8080 +... diff --git a/examples/029/dictionaries/firefox/10-manual.yml b/examples/029/dictionaries/firefox/10-manual.yml index aff6ecc..98f1381 100644 --- a/examples/029/dictionaries/firefox/10-manual.yml +++ b/examples/029/dictionaries/firefox/10-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: description: Manual proxy configuration @@ -18,3 +19,4 @@ manual: description: HTTP Port type: port default: 8080 +... diff --git a/examples/030/dictionaries/firefox/20-manual.yml b/examples/030/dictionaries/firefox/20-manual.yml index 7419635..c06545a 100644 --- a/examples/030/dictionaries/firefox/20-manual.yml +++ b/examples/030/dictionaries/firefox/20-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: @@ -5,3 +6,4 @@ manual: description: Also use this proxy for HTTPS type: boolean default: true +... diff --git a/examples/031/dictionaries/firefox/20-manual.yml b/examples/031/dictionaries/firefox/20-manual.yml index e9f8e81..46bc7e3 100644 --- a/examples/031/dictionaries/firefox/20-manual.yml +++ b/examples/031/dictionaries/firefox/20-manual.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- manual: use_for_https: description: Also use this proxy for HTTPS default: true +... diff --git a/examples/032/dictionaries/firefox/20-manual.yml b/examples/032/dictionaries/firefox/20-manual.yml index 2192056..c90f85b 100644 --- a/examples/032/dictionaries/firefox/20-manual.yml +++ b/examples/032/dictionaries/firefox/20-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: @@ -18,3 +19,4 @@ manual: description: HTTPS Port type: port default: 8080 +... diff --git a/examples/033/dictionaries/firefox/20-manual.yml b/examples/033/dictionaries/firefox/20-manual.yml index ec13d9a..bf3fd99 100644 --- a/examples/033/dictionaries/firefox/20-manual.yml +++ b/examples/033/dictionaries/firefox/20-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: @@ -19,3 +20,4 @@ manual: description: HTTPS Port type: port default: 8080 +... diff --git a/examples/034/dictionaries/firefox/20-manual.yml b/examples/034/dictionaries/firefox/20-manual.yml index 0540407..5370b9f 100644 --- a/examples/034/dictionaries/firefox/20-manual.yml +++ b/examples/034/dictionaries/firefox/20-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: @@ -20,3 +21,4 @@ manual: description: HTTPS Port type: port default: 8080 +... diff --git a/examples/035/dictionaries/firefox/20-manual.yml b/examples/035/dictionaries/firefox/20-manual.yml index 6c2507e..c88075d 100644 --- a/examples/035/dictionaries/firefox/20-manual.yml +++ b/examples/035/dictionaries/firefox/20-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: @@ -23,3 +24,4 @@ manual: type: port default: variable: manual.http_proxy.port +... diff --git a/examples/036/dictionaries/firefox/20-manual.yml b/examples/036/dictionaries/firefox/20-manual.yml index 0a73db6..8030167 100644 --- a/examples/036/dictionaries/firefox/20-manual.yml +++ b/examples/036/dictionaries/firefox/20-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: @@ -19,3 +20,4 @@ manual: description: HTTPS Port default: variable: manual.http_proxy.port +... diff --git a/examples/040/dictionaries/firefox/20-manual.yml b/examples/040/dictionaries/firefox/20-manual.yml index d0947b2..ccb40ef 100644 --- a/examples/040/dictionaries/firefox/20-manual.yml +++ b/examples/040/dictionaries/firefox/20-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: @@ -22,3 +23,4 @@ manual: description: "{{ identifier }} port" default: variable: manual.http_proxy.port +... diff --git a/examples/041/dictionaries/firefox/20-manual.yml b/examples/041/dictionaries/firefox/20-manual.yml index 416ac75..b504531 100644 --- a/examples/041/dictionaries/firefox/20-manual.yml +++ b/examples/041/dictionaries/firefox/20-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: @@ -25,3 +26,4 @@ manual: description: "{{ identifier }} port" default: variable: manual.http_proxy.port +... diff --git a/examples/042/dictionaries/firefox/20-manual.yml b/examples/042/dictionaries/firefox/20-manual.yml index 5d2ae21..6975aa9 100644 --- a/examples/042/dictionaries/firefox/20-manual.yml +++ b/examples/042/dictionaries/firefox/20-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: @@ -28,3 +29,4 @@ manual: description: "{{ identifier }} port" default: variable: manual.http_proxy.port +... diff --git a/examples/043/dictionaries/firefox/20-manual.yml b/examples/043/dictionaries/firefox/20-manual.yml index 26c6d09..fc9bd60 100644 --- a/examples/043/dictionaries/firefox/20-manual.yml +++ b/examples/043/dictionaries/firefox/20-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: @@ -30,3 +31,4 @@ manual: description: "{{ identifier }} port" default: variable: manual.http_proxy.port +... diff --git a/examples/044/dictionaries/firefox/20-manual.yml b/examples/044/dictionaries/firefox/20-manual.yml index 7ea057b..082cfff 100644 --- a/examples/044/dictionaries/firefox/20-manual.yml +++ b/examples/044/dictionaries/firefox/20-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: @@ -40,3 +41,4 @@ manual: disabled: type: identifier when: 'HTTPS' +... diff --git a/examples/050/dictionaries/firefox/10-manual.yml b/examples/050/dictionaries/firefox/10-manual.yml index b9b95dd..013508d 100644 --- a/examples/050/dictionaries/firefox/10-manual.yml +++ b/examples/050/dictionaries/firefox/10-manual.yml @@ -1,9 +1,10 @@ +%YAML 1.2 --- manual: description: Manual proxy configuration disabled: variable: proxy_mode - when_not: 'Manual proxy configuration' + when_not: Manual proxy configuration http_proxy: # HTTP Proxy @@ -17,3 +18,4 @@ manual: description: HTTP Port type: port default: 8080 +... diff --git a/examples/051/dictionaries/firefox/20-manual.yml b/examples/051/dictionaries/firefox/20-manual.yml index 53fb550..e3b9faa 100644 --- a/examples/051/dictionaries/firefox/20-manual.yml +++ b/examples/051/dictionaries/firefox/20-manual.yml @@ -1,31 +1,32 @@ +%YAML 1.2 --- manual: use_for_https: true # Also use this proxy for HTTPS - "{{ identifier }}_proxy": - description: "{{ identifier }} Proxy" - dynamic: - - HTTPS - - SOCKS + '{{ identifier }}_proxy': + description: '{{ identifier }} Proxy' hidden: - jinja: | + jinja: |- {% if my_identifier == 'HTTPS' and manual.use_for_https %} - HTTPS is same has HTTP + HTTPS is same has HTTP {% endif %} + description: | + in HTTPS case if "manual.use_for_https" is set to True params: my_identifier: type: identifier - description: | - in HTTPS case if "manual.use_for_https" is set to True + dynamic: + - HTTPS + - SOCKS address: - description: "{{ identifier }} address" + description: '{{ identifier }} address' default: variable: manual.http_proxy.address port: - description: "{{ identifier }} port" + description: '{{ identifier }} port' default: variable: manual.http_proxy.port @@ -37,4 +38,5 @@ manual: default: v5 disabled: type: identifier - when: 'HTTPS' + when: HTTPS +... diff --git a/examples/060/dictionaries/firefox/30-auto.yml b/examples/060/dictionaries/firefox/30-auto.yml index e31729a..dd9c24d 100644 --- a/examples/060/dictionaries/firefox/30-auto.yml +++ b/examples/060/dictionaries/firefox/30-auto.yml @@ -1,4 +1,6 @@ +%YAML 1.2 --- auto: description: Automatic proxy configuration URL type: web_address +... diff --git a/examples/061/dictionaries/firefox/30-auto.yml b/examples/061/dictionaries/firefox/30-auto.yml index 130fae0..e002985 100644 --- a/examples/061/dictionaries/firefox/30-auto.yml +++ b/examples/061/dictionaries/firefox/30-auto.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- auto: description: Automatic proxy configuration URL @@ -5,3 +6,4 @@ auto: disabled: variable: proxy_mode when_not: Automatic proxy configuration URL +... diff --git a/examples/070/dictionaries/firefox/40-no_proxy.yml b/examples/070/dictionaries/firefox/40-no_proxy.yml index b166d7d..971366a 100644 --- a/examples/070/dictionaries/firefox/40-no_proxy.yml +++ b/examples/070/dictionaries/firefox/40-no_proxy.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- no_proxy: description: Address for which proxy will be desactivated - type: "domainname" + type: domainname params: allow_ip: true allow_cidr_network: true @@ -10,3 +11,4 @@ no_proxy: disabled: variable: proxy_mode when: No proxy +... diff --git a/examples/071/dictionaries/firefox/40-no_proxy.yml b/examples/071/dictionaries/firefox/40-no_proxy.yml index ccc5689..0a7a052 100644 --- a/examples/071/dictionaries/firefox/40-no_proxy.yml +++ b/examples/071/dictionaries/firefox/40-no_proxy.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- no_proxy: description: Address for which proxy will be desactivated - type: "domainname" + type: domainname params: allow_ip: true allow_cidr_network: true @@ -11,3 +12,4 @@ no_proxy: disabled: variable: proxy_mode when: No proxy +... diff --git a/examples/072/dictionaries/firefox/40-no_proxy.yml b/examples/072/dictionaries/firefox/40-no_proxy.yml index c03b793..6116c48 100644 --- a/examples/072/dictionaries/firefox/40-no_proxy.yml +++ b/examples/072/dictionaries/firefox/40-no_proxy.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- no_proxy: description: Address for which proxy will be desactivated - type: "domainname" + type: domainname params: allow_ip: true allow_cidr_network: true @@ -12,3 +13,4 @@ no_proxy: disabled: variable: proxy_mode when: No proxy +... diff --git a/examples/073/dictionaries/firefox/40-no_proxy.yml b/examples/073/dictionaries/firefox/40-no_proxy.yml index 477521d..1839cb4 100644 --- a/examples/073/dictionaries/firefox/40-no_proxy.yml +++ b/examples/073/dictionaries/firefox/40-no_proxy.yml @@ -1,7 +1,12 @@ +%YAML 1.2 --- no_proxy: description: Address for which proxy will be desactivated - type: "domainname" + examples: + - .mozilla.org + - .net.nz + - 192.168.1.0/24 + type: domainname params: allow_ip: true allow_cidr_network: true @@ -12,7 +17,4 @@ no_proxy: disabled: variable: proxy_mode when: No proxy - examples: - - .mozilla.org - - .net.nz - - 192.168.1.0/24 +... diff --git a/examples/074/dictionaries/firefox/40-no_proxy.yml b/examples/074/dictionaries/firefox/40-no_proxy.yml index bcb05be..ff702a9 100644 --- a/examples/074/dictionaries/firefox/40-no_proxy.yml +++ b/examples/074/dictionaries/firefox/40-no_proxy.yml @@ -1,7 +1,13 @@ +%YAML 1.2 --- no_proxy: description: Address for which proxy will be desactivated - type: "domainname" + help: Connections to localhost, 127.0.0.1/8 and ::1 are never proxied + examples: + - .mozilla.org + - .net.nz + - 192.168.1.0/24 + type: domainname params: allow_ip: true allow_cidr_network: true @@ -12,8 +18,4 @@ no_proxy: disabled: variable: proxy_mode when: No proxy - examples: - - .mozilla.org - - .net.nz - - 192.168.1.0/24 - help: Connections to localhost, 127.0.0.1/8 and ::1 are never proxied +... diff --git a/examples/075/dictionaries/firefox/50-prompt_authentication.yml b/examples/075/dictionaries/firefox/50-prompt_authentication.yml index 3ea393c..5e9ff46 100644 --- a/examples/075/dictionaries/firefox/50-prompt_authentication.yml +++ b/examples/075/dictionaries/firefox/50-prompt_authentication.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- prompt_authentication: description: Prompt for authentication if password is saved @@ -5,3 +6,4 @@ prompt_authentication: disabled: variable: proxy_mode when: No proxy +... diff --git a/examples/076/dictionaries/firefox/55-proxy_dns_socks5.yml b/examples/076/dictionaries/firefox/55-proxy_dns_socks5.yml index c228dd4..5d575db 100644 --- a/examples/076/dictionaries/firefox/55-proxy_dns_socks5.yml +++ b/examples/076/dictionaries/firefox/55-proxy_dns_socks5.yml @@ -1,4 +1,6 @@ +%YAML 1.2 --- proxy_dns_socks5: description: Use proxy DNS when using SOCKS v5 default: false +... diff --git a/examples/077/dictionaries/firefox/55-proxy_dns_socks5.yml b/examples/077/dictionaries/firefox/55-proxy_dns_socks5.yml index a52a95e..527af5d 100644 --- a/examples/077/dictionaries/firefox/55-proxy_dns_socks5.yml +++ b/examples/077/dictionaries/firefox/55-proxy_dns_socks5.yml @@ -1,14 +1,16 @@ +%YAML 1.2 --- proxy_dns_socks5: description: Use proxy DNS when using SOCKS v5 default: false disabled: - jinja: | + jinja: |- {% if manual.socks_proxy.version is propertyerror %} - the proxy mode is not manual + the proxy mode is not manual {% elif manual.socks_proxy.version == 'v4' %} - socks version is v4 + socks version is v4 {% endif %} description: | if "firefox.proxy_mode" is not "Manual proxy configuration" or "firefox.manual.socks_proxy.version" is "v4" +... diff --git a/examples/078/dictionaries/firefox/55-proxy_dns_socks5.yml b/examples/078/dictionaries/firefox/55-proxy_dns_socks5.yml index 469c654..1a6f6e1 100644 --- a/examples/078/dictionaries/firefox/55-proxy_dns_socks5.yml +++ b/examples/078/dictionaries/firefox/55-proxy_dns_socks5.yml @@ -1,15 +1,17 @@ +%YAML 1.2 --- proxy_dns_socks5: description: Use proxy DNS when using SOCKS v5 - default: false mode: advanced + default: false disabled: - jinja: | + jinja: |- {% if manual.socks_proxy.version is propertyerror %} - the proxy mode is not manual + the proxy mode is not manual {% elif manual.socks_proxy.version == 'v4' %} - socks version is v4 + socks version is v4 {% endif %} description: | if "firefox.proxy_mode" is not "Manual proxy configuration" or "firefox.manual.socks_proxy.version" is "v4" +... diff --git a/examples/080/dictionaries/firefox/60-dns_over_https.yml b/examples/080/dictionaries/firefox/60-dns_over_https.yml index d709ea5..abaf5ac 100644 --- a/examples/080/dictionaries/firefox/60-dns_over_https.yml +++ b/examples/080/dictionaries/firefox/60-dns_over_https.yml @@ -1,4 +1,6 @@ +%YAML 1.2 --- dns_over_https: # DNS over HTTPS enable_dns_over_https: false # Enable DNS over HTTPS +... diff --git a/examples/081/dictionaries/firefox/60-dns_over_https.yml b/examples/081/dictionaries/firefox/60-dns_over_https.yml index c121470..08d089a 100644 --- a/examples/081/dictionaries/firefox/60-dns_over_https.yml +++ b/examples/081/dictionaries/firefox/60-dns_over_https.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- dns_over_https: # DNS over HTTPS @@ -13,3 +14,4 @@ dns_over_https: # DNS over HTTPS disabled: variable: dns_over_https.enable_dns_over_https when: false +... diff --git a/examples/082/dictionaries/firefox/60-dns_over_https.yml b/examples/082/dictionaries/firefox/60-dns_over_https.yml index cd5be39..dfaadd8 100644 --- a/examples/082/dictionaries/firefox/60-dns_over_https.yml +++ b/examples/082/dictionaries/firefox/60-dns_over_https.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- dns_over_https: # DNS over HTTPS @@ -18,8 +19,9 @@ dns_over_https: # DNS over HTTPS description: Custom DNS URL type: web_address disabled: - jinja: | + jinja: |- {% if dns_over_https.provider is propertyerror or dns_over_https.provider != 'Custom' %} - provider is not custom + provider is not custom {% endif %} description: if "dns_over_https.provider" is not "Custom" +... diff --git a/examples/083/dictionaries/firefox/60-dns_over_https.yml b/examples/083/dictionaries/firefox/60-dns_over_https.yml index 0c9cc15..a26ed91 100644 --- a/examples/083/dictionaries/firefox/60-dns_over_https.yml +++ b/examples/083/dictionaries/firefox/60-dns_over_https.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- dns_over_https: # DNS over HTTPS @@ -17,15 +18,16 @@ dns_over_https: # DNS over HTTPS custom_dns_url: description: Custom DNS URL type: web_address - disabled: - jinja: | - {% if dns_over_https.provider is propertyerror or dns_over_https.provider != 'Custom' %} - provider is not custom - {% endif %} - description: if "dns_over_https.provider" is not "Custom" validators: - - jinja: | + - jinja: |- {% if dns_over_https.custom_dns_url.startswith('http://') %} - only https is allowed + only https is allowed {% endif %} description: must starts with 'https://' only + disabled: + jinja: |- + {% if dns_over_https.provider is propertyerror or dns_over_https.provider != 'Custom' %} + provider is not custom + {% endif %} + description: if "dns_over_https.provider" is not "Custom" +... diff --git a/examples/090/dictionaries/firefox/00-proxy.yml b/examples/090/dictionaries/firefox/00-proxy.yml index 41f5978..b7a8bcb 100644 --- a/examples/090/dictionaries/firefox/00-proxy.yml +++ b/examples/090/dictionaries/firefox/00-proxy.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- proxy_mode: description: Configure Proxy Access to the Internet @@ -8,3 +9,4 @@ proxy_mode: - Manual proxy configuration - Automatic proxy configuration URL default: No proxy +... diff --git a/examples/090/dictionaries/firefox/10-manual.yml b/examples/090/dictionaries/firefox/10-manual.yml index 80bcc54..b5e71fd 100644 --- a/examples/090/dictionaries/firefox/10-manual.yml +++ b/examples/090/dictionaries/firefox/10-manual.yml @@ -1,9 +1,10 @@ +%YAML 1.2 --- manual: description: Manual proxy configuration disabled: variable: _.proxy_mode - when_not: 'Manual proxy configuration' + when_not: Manual proxy configuration http_proxy: # HTTP Proxy @@ -17,3 +18,4 @@ manual: description: HTTP Port type: port default: 8080 +... diff --git a/examples/090/dictionaries/firefox/20-manual.yml b/examples/090/dictionaries/firefox/20-manual.yml index 63e9f4a..e40d5bd 100644 --- a/examples/090/dictionaries/firefox/20-manual.yml +++ b/examples/090/dictionaries/firefox/20-manual.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- manual: @@ -38,3 +39,4 @@ manual: disabled: type: identifier when: 'HTTPS' +... diff --git a/examples/090/dictionaries/firefox/30-auto.yml b/examples/090/dictionaries/firefox/30-auto.yml index 0e45339..448fe52 100644 --- a/examples/090/dictionaries/firefox/30-auto.yml +++ b/examples/090/dictionaries/firefox/30-auto.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- auto: description: Automatic proxy configuration URL @@ -5,3 +6,4 @@ auto: disabled: variable: _.proxy_mode when_not: Automatic proxy configuration URL +... diff --git a/examples/090/dictionaries/firefox/40-no_proxy.yml b/examples/090/dictionaries/firefox/40-no_proxy.yml index d6bede6..27583c4 100644 --- a/examples/090/dictionaries/firefox/40-no_proxy.yml +++ b/examples/090/dictionaries/firefox/40-no_proxy.yml @@ -1,7 +1,13 @@ +%YAML 1.2 --- no_proxy: description: Address for which proxy will be desactivated - type: "domainname" + help: Connections to localhost, 127.0.0.1/8 and ::1 are never proxied + examples: + - .mozilla.org + - .net.nz + - 192.168.1.0/24 + type: domainname params: allow_ip: true allow_cidr_network: true @@ -12,8 +18,4 @@ no_proxy: disabled: variable: _.proxy_mode when: No proxy - examples: - - .mozilla.org - - .net.nz - - 192.168.1.0/24 - help: Connections to localhost, 127.0.0.1/8 and ::1 are never proxied +... diff --git a/examples/090/dictionaries/firefox/50-prompt_authentication.yml b/examples/090/dictionaries/firefox/50-prompt_authentication.yml index 7138e22..26a3d4c 100644 --- a/examples/090/dictionaries/firefox/50-prompt_authentication.yml +++ b/examples/090/dictionaries/firefox/50-prompt_authentication.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- prompt_authentication: description: Prompt for authentication if password is saved @@ -5,3 +6,4 @@ prompt_authentication: disabled: variable: _.proxy_mode when: No proxy +... diff --git a/examples/090/dictionaries/firefox/55-proxy_dns_socks5.yml b/examples/090/dictionaries/firefox/55-proxy_dns_socks5.yml index 0427894..112bd48 100644 --- a/examples/090/dictionaries/firefox/55-proxy_dns_socks5.yml +++ b/examples/090/dictionaries/firefox/55-proxy_dns_socks5.yml @@ -1,15 +1,17 @@ +%YAML 1.2 --- proxy_dns_socks5: description: Use proxy DNS when using SOCKS v5 - default: false mode: advanced + default: false disabled: - jinja: | + jinja: |- {% if _.manual.socks_proxy.version is propertyerror %} - the proxy mode is not manual + the proxy mode is not manual {% elif _.manual.socks_proxy.version == 'v4' %} - socks version is v4 + socks version is v4 {% endif %} description: | if "firefox.proxy_mode" is not "Manual proxy configuration" or "firefox.manual.socks_proxy.version" is "v4" +... diff --git a/examples/090/dictionaries/firefox/60-dns_over_https.yml b/examples/090/dictionaries/firefox/60-dns_over_https.yml index 94c0ec2..7c9e12d 100644 --- a/examples/090/dictionaries/firefox/60-dns_over_https.yml +++ b/examples/090/dictionaries/firefox/60-dns_over_https.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- dns_over_https: # DNS over HTTPS @@ -17,15 +18,16 @@ dns_over_https: # DNS over HTTPS custom_dns_url: description: Custom DNS URL type: web_address - disabled: - jinja: | - {% if _.provider is propertyerror or _.provider != 'Custom' %} - provider is not custom - {% endif %} - description: if "dns_over_https.provider" is not "Custom" validators: - - jinja: | + - jinja: |- {% if dns_over_https.custom_dns_url.startswith('http://') %} - only https is allowed + only https is allowed {% endif %} description: must starts with 'https://' only + disabled: + jinja: |- + {% if _.provider is propertyerror or _.provider != 'Custom' %} + provider is not custom + {% endif %} + description: if "dns_over_https.provider" is not "Custom" +... diff --git a/examples/091/dictionaries/firefox/20-manual.yml b/examples/091/dictionaries/firefox/20-manual.yml index b167f70..8adb88b 100644 --- a/examples/091/dictionaries/firefox/20-manual.yml +++ b/examples/091/dictionaries/firefox/20-manual.yml @@ -1,31 +1,32 @@ +%YAML 1.2 --- manual: use_for_https: true # Also use this proxy for HTTPS - "{{ identifier }}_proxy": - description: "{{ identifier }} Proxy" - dynamic: - - HTTPS - - SOCKS + '{{ identifier }}_proxy': + description: '{{ identifier }} Proxy' hidden: - jinja: | + jinja: |- {% if my_identifier == 'HTTPS' and _.use_for_https %} - HTTPS is same has HTTP + HTTPS is same has HTTP {% endif %} + description: | + in HTTPS case if "manual.use_for_https" is set to True params: my_identifier: type: identifier - description: | - in HTTPS case if "manual.use_for_https" is set to True + dynamic: + - HTTPS + - SOCKS address: - description: "{{ identifier }} address" + description: '{{ identifier }} address' default: variable: __.http_proxy.address port: - description: "{{ identifier }} port" + description: '{{ identifier }} port' default: variable: __.http_proxy.port @@ -37,4 +38,5 @@ manual: default: v5 disabled: type: identifier - when: 'HTTPS' + when: HTTPS +... diff --git a/examples/101/dictionaries/foxyproxy/00-foxyproxy.yml b/examples/101/dictionaries/foxyproxy/00-foxyproxy.yml index 1725997..3940006 100644 --- a/examples/101/dictionaries/foxyproxy/00-foxyproxy.yml +++ b/examples/101/dictionaries/foxyproxy/00-foxyproxy.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- proxies: description: Proxy configuration @@ -7,5 +8,5 @@ proxies: description: Title or Description mandatory: false - color: - description: Color + color: # Color +... diff --git a/examples/102/dictionaries/foxyproxy/00-foxyproxy.yml b/examples/102/dictionaries/foxyproxy/00-foxyproxy.yml index e19211d..c2aa8cd 100644 --- a/examples/102/dictionaries/foxyproxy/00-foxyproxy.yml +++ b/examples/102/dictionaries/foxyproxy/00-foxyproxy.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- proxies: description: Proxy configuration @@ -9,12 +10,14 @@ proxies: color: description: Color - regexp: "^#(?:[0-9a-f]{3}){1,2}$" - auto_save: true + regexp: ^#(?:[0-9a-f]{3}){1,2}$ default: - jinja: | + jinja: >- # + {%- for i in range(6) -%} - {{- '0123456789abcdef' | random -}} + {{- '0123456789abcdef' | random -}} {%- endfor -%} description: random color value + auto_save: true +... diff --git a/examples/103/dictionaries/foxyproxy/00-foxyproxy.yml b/examples/103/dictionaries/foxyproxy/00-foxyproxy.yml index 5c72d09..bb809ee 100644 --- a/examples/103/dictionaries/foxyproxy/00-foxyproxy.yml +++ b/examples/103/dictionaries/foxyproxy/00-foxyproxy.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- proxies: description: Proxy configuration @@ -22,12 +23,14 @@ proxies: color: description: Color - regexp: "^#(?:[0-9a-f]{3}){1,2}$" - auto_save: true + regexp: ^#(?:[0-9a-f]{3}){1,2}$ default: - jinja: | + jinja: >- # + {%- for i in range(6) -%} - {{- '0123456789abcdef' | random -}} + {{- '0123456789abcdef' | random -}} {%- endfor -%} description: random color value + auto_save: true +... diff --git a/examples/104/dictionaries/foxyproxy/00-foxyproxy.yml b/examples/104/dictionaries/foxyproxy/00-foxyproxy.yml index 7158b8f..183c0c2 100644 --- a/examples/104/dictionaries/foxyproxy/00-foxyproxy.yml +++ b/examples/104/dictionaries/foxyproxy/00-foxyproxy.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- proxies: description: Proxy configuration @@ -22,15 +23,16 @@ proxies: color: description: Color - regexp: "^#(?:[0-9a-f]{3}){1,2}$" - auto_save: true + regexp: ^#(?:[0-9a-f]{3}){1,2}$ default: - jinja: | + jinja: >- # + {%- for i in range(6) -%} - {{- '0123456789abcdef' | random -}} + {{- '0123456789abcdef' | random -}} {%- endfor -%} description: random color value + auto_save: true address: description: IP address, DNS name, server name @@ -38,10 +40,16 @@ proxies: params: allow_ip: true allow_without_dot: true - disabled: &needs_address - jinja: | + default: + jinja: >- + {% if firefox.manual.http_proxy.address is not propertyerror %} + {{ firefox.manual.http_proxy.address }} + {% endif %} + description: copy HTTP address if proxy is not "Manual" + disabled: + jinja: |- {% if _.type not in ['HTTP', 'HTTPS/SSL', 'SOCKS4', 'SOCKS5'] %} - disabled + disabled {% endif %} description: | if type not in: @@ -49,56 +57,85 @@ proxies: - HTTPS/SSL - SOCKS4 - SOCKS5 - default: - jinja: | - {% if firefox.manual.http_proxy.address is not propertyerror %} - {{ firefox.manual.http_proxy.address }} - {% endif %} - description: copy HTTP address if proxy is not "Manual" + port: description: Port type: port default: - jinja: | + jinja: >- {% if firefox.manual.http_proxy.port is not propertyerror %} - {{ firefox.manual.http_proxy.port }} + {{ firefox.manual.http_proxy.port }} {% endif %} description: copy HTTP port if proxy is not "Manual" - disabled: *needs_address + disabled: + jinja: |- + {% if _.type not in ['HTTP', 'HTTPS/SSL', 'SOCKS4', 'SOCKS5'] %} + disabled + {% endif %} + description: | + if type not in: + - HTTP + - HTTPS/SSL + - SOCKS4 + - SOCKS5 + username: description: Username type: unix_user mandatory: - jinja: | + jinja: |- {% if _.password is not propertyerror and _.password %} - username is mandatory + username is mandatory {% endif %} description: if a password is set - disabled: *needs_address + disabled: + jinja: |- + {% if _.type not in ['HTTP', 'HTTPS/SSL', 'SOCKS4', 'SOCKS5'] %} + disabled + {% endif %} + description: | + if type not in: + - HTTP + - HTTPS/SSL + - SOCKS4 + - SOCKS5 + password: description: Password type: secret mandatory: false - disabled: *needs_address + disabled: + jinja: |- + {% if _.type not in ['HTTP', 'HTTPS/SSL', 'SOCKS4', 'SOCKS5'] %} + disabled + {% endif %} + description: | + if type not in: + - HTTP + - HTTPS/SSL + - SOCKS4 + - SOCKS5 + url: description: URL type: web_address + default: + jinja: >- + {% if firefox.auto is not propertyerror %} + {{ firefox.auto }} + {% endif %} + description: copy HTTP address if proxy is "Auto" disabled: - jinja: | + jinja: |- {% if _.type not in ['PAC URL', 'WPAD'] %} - proxy does not need url + proxy does not need url {% endif %} description: | if type is not in: - PAC URL - WPAD - default: - jinja: | - {% if firefox.auto is not propertyerror %} - {{ firefox.auto }} - {% endif %} - description: copy HTTP address if proxy is "Auto" +... diff --git a/examples/110/dictionaries/foxyproxy/10-redefine.yml b/examples/110/dictionaries/foxyproxy/10-redefine.yml index 83578f0..aa942b3 100644 --- a/examples/110/dictionaries/foxyproxy/10-redefine.yml +++ b/examples/110/dictionaries/foxyproxy/10-redefine.yml @@ -1,5 +1,7 @@ +%YAML 1.2 --- proxies: + username: redefine: true mandatory: false @@ -7,9 +9,9 @@ proxies: password: redefine: true hidden: - type: jinja - jinja: | + jinja: |- {% if not _.username %} - no username defined + no username defined {% endif %} description: if username is not defined +...