From ca782863f092fe5e8145fe8c57fe818b8cd56402 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sat, 2 Nov 2024 14:59:04 +0100 Subject: [PATCH] [tutorial 103] xxx (config and doc) --- README.md | 34 +++++++++++++++++++++++++--------- config/02/output_ro.html | 2 +- config/03/output_ro.html | 8 +++++--- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 0fb558f..65bd1ea 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ - [Summary](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/branch/1.1/README.md) -- [[tutorial 101] xxx](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_101/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_101~1..v1.1_101)) +- [[tutorial 102] xxx](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_102/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_102~1..v1.1_102)) -# [tutorial 102] xxx +# [tutorial 103] xxx -[View the diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_102~1..v1.1_102) +[View the diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_103~1..v1.1_103) ## Screenshot @@ -224,12 +224,25 @@ dns_over_https: # DNS over HTTPS --- proxies: description: Proxy configuration - type: leadership + _type: leadership title: description: Title or Description mandatory: false + type: + description: Proxy Type + choices: + - HTTP + - HTTPS/SSL + - SOCKS4 + - SOCKS5 + - PAC URL + - WPAD + - System (use system settings) + - Direct (no proxy) + default: Direct (no proxy) + color: description: Color regexp: "^#(?:[0-9a-f]{3}){1,2}$" @@ -319,6 +332,7 @@ This family contains lists of variable blocks. | Variable                                                                                                                | Description                                                                                                             | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **foxyproxy.proxies.title**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `unique` `multiple` | Title or Description. | +| **foxyproxy.proxies.type**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | Proxy Type.
**Choices**:
- HTTP
- HTTPS/SSL
- SOCKS4
- SOCKS5
- PAC URL
- WPAD
- System (use system settings)
- Direct (no proxy) ← (default) | | **foxyproxy.proxies.color**
[`regexp`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` `auto modified` | Color.
**Default**: random color value. | @@ -373,7 +387,6 @@ foxyproxy: foo@bar:~$ rougail -v 1.1 -m firefox/ -s Firefox -xn FoxyProxy -xd 0 foxyproxy/ --modes_level basic standard advanced -u file -ff config/02/config.yaml ``` 
🛑 ERRORS
-┣━━ unknown option "type" in optiondescription "foxyproxy.proxies" (Proxy configuration)
 ┗━━ unknown option "address" in optiondescription "foxyproxy.proxies" (Proxy configuration)
 ╭────────────────────────── Caption ──────────────────────────╮
 │ Variable                           Default value            │
@@ -390,6 +403,7 @@ Variables:
     ┗━━ 📂 proxies
         ┗━━ 📂 title
             ┣━━ 📓 title: My company
+            ┣━━ 📓 type: HTTP (Direct (no proxy))
             ┗━━ 📓 color: #66cc66
### Example 3 @@ -426,10 +440,9 @@ foxyproxy: foo@bar:~$ rougail -v 1.1 -m firefox/ -s Firefox -xn FoxyProxy -xd 0 foxyproxy/ --modes_level basic standard advanced -u file -ff config/03/config.yaml ``` 
🛑 ERRORS
-┣━━ unknown option "url" in optiondescription "foxyproxy.proxies" (Proxy configuration)
-┣━━ unknown option "username" in optiondescription "foxyproxy.proxies" (Proxy configuration)
 ┣━━ unknown option "password" in optiondescription "foxyproxy.proxies" (Proxy configuration)
-┗━━ unknown option "type" in optiondescription "foxyproxy.proxies" (Proxy configuration)
+┣━━ unknown option "username" in optiondescription "foxyproxy.proxies" (Proxy configuration)
+┗━━ unknown option "url" in optiondescription "foxyproxy.proxies" (Proxy configuration)
 ╭────────────────────────── Caption ──────────────────────────╮
 │ Variable                           Default value            │
 │ Undocumented variable              Modified value           │
@@ -460,14 +473,17 @@ Variables:
     ┗━━ 📂 proxies
         ┣━━ 📂 title
         ┃   ┣━━ 📓 title: My company
+        ┃   ┣━━ 📓 type: HTTP (Direct (no proxy))
         ┃   ┗━━ 📓 color: #66cc66
         ┣━━ 📂 title
         ┃   ┣━━ 📓 title: An other company
+        ┃   ┣━━ 📓 type: SOCKS5 (Direct (no proxy))
         ┃   ┗━━ 📓 color: #cc66cc
         ┗━━ 📂 title
             ┣━━ 📓 title: WPAD
+            ┣━━ 📓 type: WPAD (Direct (no proxy))
             ┗━━ 📓 color: #1166cc
-- [[tutorial 103] xxx](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_103/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_103~1..v1.1_103)) +- [[tutorial 104] xxx](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_104/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_104~1..v1.1_104)) diff --git a/config/02/output_ro.html b/config/02/output_ro.html index c9b105a..bb68375 100644 --- a/config/02/output_ro.html +++ b/config/02/output_ro.html @@ -1,5 +1,4 @@ 
🛑 ERRORS
-┣━━ unknown option "type" in optiondescription "foxyproxy.proxies" (Proxy configuration)
 ┗━━ unknown option "address" in optiondescription "foxyproxy.proxies" (Proxy configuration)
 ╭────────────────────────── Caption ──────────────────────────╮
 │ Variable                           Default value            │
@@ -16,5 +15,6 @@ Variables:
     ┗━━ 📂 proxies
         ┗━━ 📂 title
             ┣━━ 📓 title: My company
+            ┣━━ 📓 type: HTTP (Direct (no proxy))
             ┗━━ 📓 color: #66cc66
diff --git a/config/03/output_ro.html b/config/03/output_ro.html index d194b45..c687f72 100644 --- a/config/03/output_ro.html +++ b/config/03/output_ro.html @@ -1,8 +1,7 @@ 
🛑 ERRORS
-┣━━ unknown option "url" in optiondescription "foxyproxy.proxies" (Proxy configuration)
-┣━━ unknown option "username" in optiondescription "foxyproxy.proxies" (Proxy configuration)
 ┣━━ unknown option "password" in optiondescription "foxyproxy.proxies" (Proxy configuration)
-┗━━ unknown option "type" in optiondescription "foxyproxy.proxies" (Proxy configuration)
+┣━━ unknown option "username" in optiondescription "foxyproxy.proxies" (Proxy configuration)
+┗━━ unknown option "url" in optiondescription "foxyproxy.proxies" (Proxy configuration)
 ╭────────────────────────── Caption ──────────────────────────╮
 │ Variable                           Default value            │
 │ Undocumented variable              Modified value           │
@@ -33,11 +32,14 @@ Variables:
     ┗━━ 📂 proxies
         ┣━━ 📂 title
         ┃   ┣━━ 📓 title: My company
+        ┃   ┣━━ 📓 type: HTTP (Direct (no proxy))
         ┃   ┗━━ 📓 color: #66cc66
         ┣━━ 📂 title
         ┃   ┣━━ 📓 title: An other company
+        ┃   ┣━━ 📓 type: SOCKS5 (Direct (no proxy))
         ┃   ┗━━ 📓 color: #cc66cc
         ┗━━ 📂 title
             ┣━━ 📓 title: WPAD
+            ┣━━ 📓 type: WPAD (Direct (no proxy))
             ┗━━ 📓 color: #1166cc