diff --git a/README.md b/README.md
index e0b4adbd..3c313bc0 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 v1.1_026] A variable with type "boolean"](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_026/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_026~1..v1.1_026))
+- [[tutorial v1.1_027] Copy HTTP manual proxy to HTTPS manual proxy](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_027/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_027~1..v1.1_027))
-# [tutorial v1.1_027)] Copy HTTP manual proxy to HTTPS manual proxy
+# [tutorial v1.1_030)] A disabled family
-[View the diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_027~1..v1.1_027)
+[View the diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_030~1..v1.1_030)
## Screenshot
@@ -43,7 +43,9 @@ proxy_mode:
---
version: 1.1
-manual: # Manual proxy configuration
+manual:
+ description: Manual proxy configuration
+ disabled: true
http_proxy: # HTTP Proxy
@@ -90,59 +92,27 @@ manual:
### Let's generate the documentation
```console
-foo@bar:~$ git switch --detach v1.1_027
+foo@bar:~$ git switch --detach v1.1_030
foo@bar:~$ rougail -m firefox/ -o doc
```
| 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
-
-**manual**
-
-
-
-##### HTTP Proxy
-
-**manual.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.
**Validators**:
- well-known ports (1 to 1023) are allowed
- registred ports (1024 to 49151) are allowed
- private ports (greater than 49152) are allowed
**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 |
-
-##### HTTPS Proxy
-
-**manual.https_proxy**
-
-
-
-| Variable | Description |
-|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **manual.https_proxy.address**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | HTTPS address.
**Validator**: the domain name can be an IP |
-| **manual.https_proxy.port**
[`port`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | HTTPS Port.
**Validators**:
- well-known ports (1 to 1023) are allowed
- registred ports (1024 to 49151) are allowed
- private ports (greater than 49152) are allowed
**Default**: 8080 |
-
### Let's generate the changelog
```console
-foo@bar:~$ git switch --detach v1.1_027
+foo@bar:~$ git switch --detach v1.1_030
foo@bar:~$ rougail -m firefox/ -o doc --doc.contents changelog
```
-#### New variables
-
-| Variable | Description |
-|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **manual.https_proxy.address**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | HTTPS address.
**Validator**: the domain name can be an IP |
-| **manual.https_proxy.port**
[`port`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | HTTPS Port.
**Validators**:
- well-known ports (1 to 1023) are allowed
- registred ports (1024 to 49151) are allowed
- private ports (greater than 49152) are allowed
**Default**: 8080 |
+#### Deleted variables
+- manual.http_proxy.address
+- manual.http_proxy.port
+- manual.use_for_https
+- manual.https_proxy.address
+- manual.https_proxy.port
## User datas
### Example 1
@@ -157,46 +127,32 @@ foo@bar:~$ rougail -m firefox/ -o doc --doc.contents changelog
#### Output
```console
-foo@bar:~$ git switch --detach v1.1_027
+foo@bar:~$ git switch --detach v1.1_030
foo@bar:~$ rougail -m firefox/ -u yaml -ff config/01/config.yaml
```
-
🛑 ERRORS -┗━━ The following variables are mandatory but have no value: - ┗━━ Manual proxy configuration - ┣━━ HTTP Proxy - ┃ ┗━━ HTTP address - ┗━━ HTTPS Proxy - ┗━━ HTTPS address +╭─────── Caption ────────╮ +│ Variable Default value │ +╰────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: No proxy ++#### Output in read write mode + +```console +foo@bar:~$ git switch --detach v1.1_030 +foo@bar:~$ rougail -m firefox/ -u yaml -ff config/01/config.yaml --cli.read_write +``` +╭─────── Caption ────────╮ +│ Variable Default value │ +╰────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: No proxy### Example 2 #### config/02/config.yaml -```yml ---- -proxy_mode: No proxy - -``` -#### Output - -```console -foo@bar:~$ git switch --detach v1.1_027 -foo@bar:~$ rougail -m firefox/ -u yaml -ff config/02/config.yaml -``` -🛑 ERRORS -┗━━ The following variables are mandatory but have no value: - ┗━━ Manual proxy configuration - ┣━━ HTTP Proxy - ┃ ┗━━ HTTP address - ┗━━ HTTPS Proxy - ┗━━ HTTPS address --### Example 3 - -#### config/03/config.yaml - - ```yml --- proxy_mode: Manual proxy configuration @@ -205,16 +161,71 @@ proxy_mode: Manual proxy configuration #### Output ```console -foo@bar:~$ git switch --detach v1.1_027 +foo@bar:~$ git switch --detach v1.1_030 +foo@bar:~$ rougail -m firefox/ -u yaml -ff config/02/config.yaml +``` +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/02/config.yaml" (⏳ No proxy) ++#### Output in read write mode + +```console +foo@bar:~$ git switch --detach v1.1_030 +foo@bar:~$ rougail -m firefox/ -u yaml -ff config/02/config.yaml --cli.read_write +``` +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/02/config.yaml" (⏳ No proxy) ++### Example 3 + +#### config/03/config.yaml + + +```yml +--- +proxy_mode: Manual proxy configuration +manual: + http_proxy: + address: example.net + +``` +#### Output + +```console +foo@bar:~$ git switch --detach v1.1_030 foo@bar:~$ rougail -m firefox/ -u yaml -ff config/03/config.yaml ``` -🛑 ERRORS -┗━━ The following variables are mandatory but have no value: - ┗━━ Manual proxy configuration - ┣━━ HTTP Proxy - ┃ ┗━━ HTTP address - ┗━━ HTTPS Proxy - ┗━━ HTTPS address +🔔 WARNINGS +┗━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.address" (HTTP address) will be ignored when loading from the YAML file "config/03/config.yaml" +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/03/config.yaml" (⏳ No proxy) ++#### Output in read write mode + +```console +foo@bar:~$ git switch --detach v1.1_030 +foo@bar:~$ rougail -m firefox/ -u yaml -ff config/03/config.yaml --cli.read_write +``` +🔔 WARNINGS +┗━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.address" (HTTP address) will be ignored when loading from the YAML file "config/03/config.yaml" +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/03/config.yaml" (⏳ No proxy)### Example 4 @@ -223,25 +234,44 @@ foo@bar:~$ rougail -m firefox/ -u yaml -ff config/03/config.yaml ```yml --- -proxy_mode: foo +proxy_mode: Manual proxy configuration +manual: + http_proxy: + address: example.net + port: '3128' ``` #### Output ```console -foo@bar:~$ git switch --detach v1.1_027 +foo@bar:~$ git switch --detach v1.1_030 foo@bar:~$ rougail -m firefox/ -u yaml -ff config/04/config.yaml ```🔔 WARNINGS -┗━━ the value "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, it will be ignored when loading from the YAML file "config/04/config.yaml" -🛑 ERRORS -┗━━ The following variables are mandatory but have no value: - ┗━━ Manual proxy configuration - ┣━━ HTTP Proxy - ┃ ┗━━ HTTP address - ┗━━ HTTPS Proxy - ┗━━ HTTPS address +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.address" (HTTP address) will be ignored when loading from the YAML file "config/04/config.yaml" +┗━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.port" (HTTP Port) will be ignored when loading from the YAML file "config/04/config.yaml" +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/04/config.yaml" (⏳ No proxy) ++#### Output in read write mode + +```console +foo@bar:~$ git switch --detach v1.1_030 +foo@bar:~$ rougail -m firefox/ -u yaml -ff config/04/config.yaml --cli.read_write +``` +🔔 WARNINGS +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.address" (HTTP address) will be ignored when loading from the YAML file "config/04/config.yaml" +┗━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.port" (HTTP Port) will be ignored when loading from the YAML file "config/04/config.yaml" +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/04/config.yaml" (⏳ No proxy)### Example 5 @@ -250,26 +280,52 @@ foo@bar:~$ rougail -m firefox/ -u yaml -ff config/04/config.yaml ```yml --- -proxy_mode: 1 +proxy_mode: Manual proxy configuration +manual: + http_proxy: + address: http.proxy.net + port: '3128' + use_for_https: false + https_proxy: + address: https.proxy.net ``` #### Output ```console -foo@bar:~$ git switch --detach v1.1_027 +foo@bar:~$ git switch --detach v1.1_030 foo@bar:~$ rougail -m firefox/ -u yaml -ff config/05/config.yaml ```🔔 WARNINGS -┗━━ the value "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, it will be ignored when loading from the YAML file "config/05/config.yaml" -🛑 ERRORS -┗━━ The following variables are mandatory but have no value: - ┗━━ Manual proxy configuration - ┣━━ HTTP Proxy - ┃ ┗━━ HTTP address - ┗━━ HTTPS Proxy - ┗━━ HTTPS address +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.address" (HTTP address) will be ignored when loading from the YAML file "config/05/config.yaml" +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.port" (HTTP Port) will be ignored when loading from the YAML file "config/05/config.yaml" +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.use_for_https" (Also use this proxy for HTTPS) will be ignored when loading from the YAML file "config/05/config.yaml" +┗━━ family "manual" (Manual proxy configuration) is disabled, "manual.https_proxy.address" (HTTPS address) will be ignored when loading from the YAML file "config/05/config.yaml" +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/05/config.yaml" (⏳ No proxy) ++#### Output in read write mode + +```console +foo@bar:~$ git switch --detach v1.1_030 +foo@bar:~$ rougail -m firefox/ -u yaml -ff config/05/config.yaml --cli.read_write +``` +🔔 WARNINGS +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.address" (HTTP address) will be ignored when loading from the YAML file "config/05/config.yaml" +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.port" (HTTP Port) will be ignored when loading from the YAML file "config/05/config.yaml" +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.use_for_https" (Also use this proxy for HTTPS) will be ignored when loading from the YAML file "config/05/config.yaml" +┗━━ family "manual" (Manual proxy configuration) is disabled, "manual.https_proxy.address" (HTTPS address) will be ignored when loading from the YAML file "config/05/config.yaml" +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/05/config.yaml" (⏳ No proxy)-- [[tutorial v1.1_030] A disabled family](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_030/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_030~1..v1.1_030)) +- [[tutorial v1.1_031] A conditional disabled family with a variable](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_031/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_031~1..v1.1_031)) diff --git a/config/01/output_ro.html b/config/01/output_ro.html index 45e42766..ea9c2266 100644 --- a/config/01/output_ro.html +++ b/config/01/output_ro.html @@ -1,8 +1,6 @@ -🛑 ERRORS -┗━━ The following variables are mandatory but have no value: - ┗━━ Manual proxy configuration - ┣━━ HTTP Proxy - ┃ ┗━━ HTTP address - ┗━━ HTTPS Proxy - ┗━━ HTTPS address +╭─────── Caption ────────╮ +│ Variable Default value │ +╰────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: No proxydiff --git a/config/01/output_rw.html b/config/01/output_rw.html new file mode 100644 index 00000000..ea9c2266 --- /dev/null +++ b/config/01/output_rw.html @@ -0,0 +1,6 @@ +╭─────── Caption ────────╮ +│ Variable Default value │ +╰────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: No proxy +diff --git a/config/02/config.yaml b/config/02/config.yaml index d9144882..74edb225 100644 --- a/config/02/config.yaml +++ b/config/02/config.yaml @@ -1,2 +1,2 @@ --- -proxy_mode: No proxy +proxy_mode: Manual proxy configuration diff --git a/config/02/output_ro.html b/config/02/output_ro.html index 45e42766..43e8b965 100644 --- a/config/02/output_ro.html +++ b/config/02/output_ro.html @@ -1,8 +1,7 @@ -🛑 ERRORS -┗━━ The following variables are mandatory but have no value: - ┗━━ Manual proxy configuration - ┣━━ HTTP Proxy - ┃ ┗━━ HTTP address - ┗━━ HTTPS Proxy - ┗━━ HTTPS address +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/02/config.yaml" (⏳ No proxy)diff --git a/config/02/output_rw.html b/config/02/output_rw.html new file mode 100644 index 00000000..43e8b965 --- /dev/null +++ b/config/02/output_rw.html @@ -0,0 +1,7 @@ +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/02/config.yaml" (⏳ No proxy) +diff --git a/config/03/config.yaml b/config/03/config.yaml index 74edb225..e3db924b 100644 --- a/config/03/config.yaml +++ b/config/03/config.yaml @@ -1,2 +1,5 @@ --- proxy_mode: Manual proxy configuration +manual: + http_proxy: + address: example.net diff --git a/config/03/output_ro.html b/config/03/output_ro.html index 45e42766..9fb4d886 100644 --- a/config/03/output_ro.html +++ b/config/03/output_ro.html @@ -1,8 +1,9 @@ -🛑 ERRORS -┗━━ The following variables are mandatory but have no value: - ┗━━ Manual proxy configuration - ┣━━ HTTP Proxy - ┃ ┗━━ HTTP address - ┗━━ HTTPS Proxy - ┗━━ HTTPS address +🔔 WARNINGS +┗━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.address" (HTTP address) will be ignored when loading from the YAML file "config/03/config.yaml" +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/03/config.yaml" (⏳ No proxy)diff --git a/config/03/output_rw.html b/config/03/output_rw.html new file mode 100644 index 00000000..9fb4d886 --- /dev/null +++ b/config/03/output_rw.html @@ -0,0 +1,9 @@ +🔔 WARNINGS +┗━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.address" (HTTP address) will be ignored when loading from the YAML file "config/03/config.yaml" +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/03/config.yaml" (⏳ No proxy) +diff --git a/config/04/config.yaml b/config/04/config.yaml index e3fa25da..c8d73af3 100644 --- a/config/04/config.yaml +++ b/config/04/config.yaml @@ -1,2 +1,6 @@ --- -proxy_mode: foo +proxy_mode: Manual proxy configuration +manual: + http_proxy: + address: example.net + port: '3128' diff --git a/config/04/output_ro.html b/config/04/output_ro.html index 9ec69044..e654b746 100644 --- a/config/04/output_ro.html +++ b/config/04/output_ro.html @@ -1,11 +1,10 @@🔔 WARNINGS -┗━━ the value "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, it will be ignored when loading from the YAML file "config/04/config.yaml" -🛑 ERRORS -┗━━ The following variables are mandatory but have no value: - ┗━━ Manual proxy configuration - ┣━━ HTTP Proxy - ┃ ┗━━ HTTP address - ┗━━ HTTPS Proxy - ┗━━ HTTPS address +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.address" (HTTP address) will be ignored when loading from the YAML file "config/04/config.yaml" +┗━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.port" (HTTP Port) will be ignored when loading from the YAML file "config/04/config.yaml" +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/04/config.yaml" (⏳ No proxy)diff --git a/config/04/output_rw.html b/config/04/output_rw.html new file mode 100644 index 00000000..e654b746 --- /dev/null +++ b/config/04/output_rw.html @@ -0,0 +1,10 @@ +🔔 WARNINGS +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.address" (HTTP address) will be ignored when loading from the YAML file "config/04/config.yaml" +┗━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.port" (HTTP Port) will be ignored when loading from the YAML file "config/04/config.yaml" +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/04/config.yaml" (⏳ No proxy) +diff --git a/config/05/config.yaml b/config/05/config.yaml index bf6f64ca..4a1f7890 100644 --- a/config/05/config.yaml +++ b/config/05/config.yaml @@ -1,2 +1,9 @@ --- -proxy_mode: 1 +proxy_mode: Manual proxy configuration +manual: + http_proxy: + address: http.proxy.net + port: '3128' + use_for_https: false + https_proxy: + address: https.proxy.net diff --git a/config/05/output_ro.html b/config/05/output_ro.html index 498a23ea..33b115ae 100644 --- a/config/05/output_ro.html +++ b/config/05/output_ro.html @@ -1,11 +1,12 @@🔔 WARNINGS -┗━━ the value "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, it will be ignored when loading from the YAML file "config/05/config.yaml" -🛑 ERRORS -┗━━ The following variables are mandatory but have no value: - ┗━━ Manual proxy configuration - ┣━━ HTTP Proxy - ┃ ┗━━ HTTP address - ┗━━ HTTPS Proxy - ┗━━ HTTPS address +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.address" (HTTP address) will be ignored when loading from the YAML file "config/05/config.yaml" +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.port" (HTTP Port) will be ignored when loading from the YAML file "config/05/config.yaml" +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.use_for_https" (Also use this proxy for HTTPS) will be ignored when loading from the YAML file "config/05/config.yaml" +┗━━ family "manual" (Manual proxy configuration) is disabled, "manual.https_proxy.address" (HTTPS address) will be ignored when loading from the YAML file "config/05/config.yaml" +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/05/config.yaml" (⏳ No proxy)diff --git a/config/05/output_rw.html b/config/05/output_rw.html new file mode 100644 index 00000000..33b115ae --- /dev/null +++ b/config/05/output_rw.html @@ -0,0 +1,12 @@ +🔔 WARNINGS +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.address" (HTTP address) will be ignored when loading from the YAML file "config/05/config.yaml" +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.http_proxy.port" (HTTP Port) will be ignored when loading from the YAML file "config/05/config.yaml" +┣━━ family "manual" (Manual proxy configuration) is disabled, "manual.use_for_https" (Also use this proxy for HTTPS) will be ignored when loading from the YAML file "config/05/config.yaml" +┗━━ family "manual" (Manual proxy configuration) is disabled, "manual.https_proxy.address" (HTTPS address) will be ignored when loading from the YAML file "config/05/config.yaml" +╭────────────── Caption ───────────────╮ +│ Variable Modified value │ +│ (⏳ Original default value) │ +╰──────────────────────────────────────╯ +Variables: +┗━━ 📓 Configure Proxy Access to the Internet: Manual proxy configuration ◀ loaded from the YAML file "config/05/config.yaml" (⏳ No proxy) +