diff --git a/README.md b/README.md
index 22ed199..3a4dae3 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 050] Family: "shorthand" mode](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_050/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_050~1..v1.1_050))
+- [[tutorial 051] Variable: "shorthand" mode](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_051/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_051~1..v1.1_051))
-# [tutorial 051] Variable: "shorthand" mode
+# [tutorial 060] A variable with type "web_address"
-[View the diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_051~1..v1.1_051)
+[View the diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_060~1..v1.1_060)
## Screenshot
@@ -101,6 +101,16 @@ manual:
type: identifier
when: 'HTTPS'
+```
+### firefox/30-auto.yml
+
+
+```yml
+---
+auto:
+ description: Automatic proxy configuration URL
+ type: web_address
+
```
### Generated documentation
@@ -109,9 +119,9 @@ foo@bar:~$ rougail -v 1.1 -m firefox/ -o doc -do github
```
### Variables
-| Variable | Description |
-|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **proxy_mode**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | Configure Proxy Access to the Internet.
**Choices**:
- No proxy ← (default)
- Auto-detect proxy settings for this network
- Use system proxy settings
- Manual proxy configuration
- Automatic proxy configuration URL |
+| Variable | Description |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **proxy_mode**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | Configure Proxy Access to the Internet.
**Choices**:
- No proxy ← (default)
- Auto-detect proxy settings for this network
- Use system proxy settings
- Manual proxy configuration
- Automatic proxy configuration URL |
#### Manual proxy configuration
@@ -121,14 +131,14 @@ _`disabled`_
##### HTTP Proxy
-| Variable | Description |
-|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **manual.http_proxy.address**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | HTTP address.
**Validator**: the domain name can be an IP |
-| **manual.http_proxy.port**
[`port`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | HTTP Port.
**Default**: 8080 |
+| Variable | Description |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **manual.http_proxy.address**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | HTTP address.
**Validator**: the domain name can be an IP |
+| **manual.http_proxy.port**
[`port`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | HTTP Port.
**Default**: 8080 |
-| Variable | Description |
-|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **manual.use_for_https**
[`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | Also use this proxy for HTTPS.
**Default**: True |
+| Variable | Description |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **manual.use_for_https**
[`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | Also use this proxy for HTTPS.
**Default**: True |
##### "*HTTPS* Proxy" or "*SOCKS* Proxy"
@@ -141,11 +151,15 @@ This family builds families dynamically.
**Identifiers**:
- HTTPS
- SOCKS
-| Variable | Description |
-|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **manual.https_proxy.address** or **manual.socks_proxy.address**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | "*HTTPS* address" or "*SOCKS* address".
**Validator**: the domain name can be an IP
**Default**: the value of the variable "manual.http_proxy.address". |
-| **manual.https_proxy.port** or **manual.socks_proxy.port**
[`port`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | "*HTTPS* port" or "*SOCKS* port".
**Default**: the value of the variable "manual.http_proxy.port". |
-| **manual.https_proxy.version** or **manual.socks_proxy.version**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` _`disabled`_ | SOCKS host version used by proxy.
**Choices**:
- v4
- v5 ← (default)
**Disabled**: when the identifier is "HTTPS". |
+| Variable | Description |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **manual.https_proxy.address** or **manual.socks_proxy.address**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | "*HTTPS* address" or "*SOCKS* address".
**Validator**: the domain name can be an IP
**Default**: the value of the variable "manual.http_proxy.address". |
+| **manual.https_proxy.port** or **manual.socks_proxy.port**
[`port`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | "*HTTPS* port" or "*SOCKS* port".
**Default**: the value of the variable "manual.http_proxy.port". |
+| **manual.https_proxy.version** or **manual.socks_proxy.version**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` _`disabled`_ | SOCKS host version used by proxy.
**Choices**:
- v4
- v5 ← (default)
**Disabled**: when the identifier is "HTTPS". |
+
+| Variable | Description |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **auto**
[`web_address`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | Automatic proxy configuration URL. |
## User data
@@ -157,6 +171,7 @@ This family builds families dynamically.
```yml
---
+auto: https://auto.proxy.net/wpad.dat
```
#### Output
@@ -171,7 +186,8 @@ foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/01/config.yaml
│ Unmodifiable variable │
╰─────────────────────────────────────────────────────────────╯
Variables:
-┗━━ 📓 proxy_mode: No proxy
+┣━━ 📓 proxy_mode: No proxy
+┗━━ 📓 auto: https://auto.proxy.net/wpad.dat
### Example 2
@@ -180,7 +196,7 @@ Variables:
```yml
---
-proxy_mode: No proxy
+proxy_mode: Automatic proxy configuration URL
```
#### Output
@@ -188,14 +204,9 @@ proxy_mode: No proxy
```console
foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/02/config.yaml
```
-
╭────────────────────────── Caption ──────────────────────────╮ -│ Variable Default value │ -│ Undocumented variable Modified value │ -│ Undocumented but modified variable (Original default value) │ -│ Unmodifiable variable │ -╰─────────────────────────────────────────────────────────────╯ -Variables: -┗━━ 📓 proxy_mode: No proxy (No proxy) +🛑 ERRORS +┣━━ The following variables are mandatory but have no value: +┗━━ - auto (Automatic proxy configuration URL)### Example 3 @@ -204,7 +215,8 @@ Variables: ```yml --- -proxy_mode: Manual proxy configuration +proxy_mode: Automatic proxy configuration URL +auto: https://auto.proxy.net/wpad.dat ``` #### Output @@ -212,67 +224,16 @@ proxy_mode: Manual proxy configuration ```console foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/03/config.yaml ``` -🛑 ERRORS -┣━━ The following variables are mandatory but have no value: -┣━━ - manual.http_proxy.address (HTTP address) -┗━━ - manual.socks_proxy.address (SOCKS address) --### Example 4 - -#### config/04/config.yaml - - -```yml ---- -proxy_mode: foo - -``` -#### Output - -```console -foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/04/config.yaml -``` -🛑 ERRORS -┗━━ "foo" is an invalid choice for "proxy_mode (Configure Proxy Access to the Internet)", only - "Auto-detect proxy settings for this network", "Automatic proxy configuration URL", "Manual proxy - configuration", "No proxy" and "Use system proxy settings" are allowed -╭────────────────────────── Caption ──────────────────────────╮ +diff --git a/config/02/config.yaml b/config/02/config.yaml index d914488..26df130 100644 --- a/config/02/config.yaml +++ b/config/02/config.yaml @@ -1,2 +1,2 @@ --- -proxy_mode: No proxy +proxy_mode: Automatic proxy configuration URL diff --git a/config/02/output_ro.html b/config/02/output_ro.html index 38b2d86..0740549 100644 --- a/config/02/output_ro.html +++ b/config/02/output_ro.html @@ -1,9 +1,4 @@ -╭────────────────────────── Caption ──────────────────────────╮ │ Variable Default value │ │ Undocumented variable Modified value │ │ Undocumented but modified variable (Original default value) │ │ Unmodifiable variable │ ╰─────────────────────────────────────────────────────────────╯ Variables: -┗━━ 📓 proxy_mode: No proxy --### Example 5 - -#### config/05/config.yaml - - -```yml ---- -proxy_mode: 1 - -``` -#### Output - -```console -foo@bar:~$ rougail -v 1.1 -m firefox/ -u file -ff config/05/config.yaml -``` -🛑 ERRORS -┗━━ "1" is an invalid choice for "proxy_mode (Configure Proxy Access to the Internet)", only "Auto-detect - proxy settings for this network", "Automatic proxy configuration URL", "Manual proxy configuration", - "No proxy" and "Use system proxy settings" are allowed -╭────────────────────────── Caption ──────────────────────────╮ -│ Variable Default value │ -│ Undocumented variable Modified value │ -│ Undocumented but modified variable (Original default value) │ -│ Unmodifiable variable │ -╰─────────────────────────────────────────────────────────────╯ -Variables: -┗━━ 📓 proxy_mode: No proxy +┣━━ 📓 proxy_mode: Automatic proxy configuration URL (No proxy) +┗━━ 📓 auto: https://auto.proxy.net/wpad.dat-- [[tutorial 060] A variable with type "web_address"](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_060/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_060~1..v1.1_060)) +- [[tutorial 061] A conditional disabled variable](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_061/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_061~1..v1.1_061)) diff --git a/config/01/config.yaml b/config/01/config.yaml index ed97d53..1edbe91 100644 --- a/config/01/config.yaml +++ b/config/01/config.yaml @@ -1 +1,2 @@ --- +auto: https://auto.proxy.net/wpad.dat diff --git a/config/01/output_ro.html b/config/01/output_ro.html index cdecbe8..4009618 100644 --- a/config/01/output_ro.html +++ b/config/01/output_ro.html @@ -5,5 +5,6 @@ │ Unmodifiable variable │ ╰─────────────────────────────────────────────────────────────╯ Variables: -┗━━ 📓 proxy_mode: No proxy +┣━━ 📓 proxy_mode: No proxy +┗━━ 📓 auto: https://auto.proxy.net/wpad.dat╭────────────────────────── Caption ──────────────────────────╮ -│ Variable Default value │ -│ Undocumented variable Modified value │ -│ Undocumented but modified variable (Original default value) │ -│ Unmodifiable variable │ -╰─────────────────────────────────────────────────────────────╯ -Variables: -┗━━ 📓 proxy_mode: No proxy (No proxy) +🛑 ERRORS +┣━━ The following variables are mandatory but have no value: +┗━━ - auto (Automatic proxy configuration URL)diff --git a/config/03/config.yaml b/config/03/config.yaml index 74edb22..307e175 100644 --- a/config/03/config.yaml +++ b/config/03/config.yaml @@ -1,2 +1,3 @@ --- -proxy_mode: Manual proxy configuration +proxy_mode: Automatic proxy configuration URL +auto: https://auto.proxy.net/wpad.dat diff --git a/config/03/output_ro.html b/config/03/output_ro.html index 15e7f44..72a41f0 100644 --- a/config/03/output_ro.html +++ b/config/03/output_ro.html @@ -1,5 +1,10 @@ -🛑 ERRORS -┣━━ The following variables are mandatory but have no value: -┣━━ - manual.http_proxy.address (HTTP address) -┗━━ - manual.socks_proxy.address (SOCKS address) +╭────────────────────────── Caption ──────────────────────────╮ +│ Variable Default value │ +│ Undocumented variable Modified value │ +│ Undocumented but modified variable (Original default value) │ +│ Unmodifiable variable │ +╰─────────────────────────────────────────────────────────────╯ +Variables: +┣━━ 📓 proxy_mode: Automatic proxy configuration URL (No proxy) +┗━━ 📓 auto: https://auto.proxy.net/wpad.datdiff --git a/config/04/config.yaml b/config/04/config.yaml deleted file mode 100644 index e3fa25d..0000000 --- a/config/04/config.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -proxy_mode: foo diff --git a/config/04/output_ro.html b/config/04/output_ro.html deleted file mode 100644 index 5fe2e0d..0000000 --- a/config/04/output_ro.html +++ /dev/null @@ -1,13 +0,0 @@ -🛑 ERRORS -┗━━ "foo" is an invalid choice for "proxy_mode (Configure Proxy Access to the Internet)", only - "Auto-detect proxy settings for this network", "Automatic proxy configuration URL", "Manual proxy - configuration", "No proxy" and "Use system proxy settings" are allowed -╭────────────────────────── Caption ──────────────────────────╮ -│ Variable Default value │ -│ Undocumented variable Modified value │ -│ Undocumented but modified variable (Original default value) │ -│ Unmodifiable variable │ -╰─────────────────────────────────────────────────────────────╯ -Variables: -┗━━ 📓 proxy_mode: No proxy -diff --git a/config/05/config.yaml b/config/05/config.yaml deleted file mode 100644 index bf6f64c..0000000 --- a/config/05/config.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -proxy_mode: 1 diff --git a/config/05/output_ro.html b/config/05/output_ro.html deleted file mode 100644 index 071b4d5..0000000 --- a/config/05/output_ro.html +++ /dev/null @@ -1,13 +0,0 @@ -🛑 ERRORS -┗━━ "1" is an invalid choice for "proxy_mode (Configure Proxy Access to the Internet)", only "Auto-detect - proxy settings for this network", "Automatic proxy configuration URL", "Manual proxy configuration", - "No proxy" and "Use system proxy settings" are allowed -╭────────────────────────── Caption ──────────────────────────╮ -│ Variable Default value │ -│ Undocumented variable Modified value │ -│ Undocumented but modified variable (Original default value) │ -│ Unmodifiable variable │ -╰─────────────────────────────────────────────────────────────╯ -Variables: -┗━━ 📓 proxy_mode: No proxy -diff --git a/firefox.png b/firefox.png index b7ca7aa..20701e2 100644 Binary files a/firefox.png and b/firefox.png differ