diff --git a/README.md b/README.md
index ea041af3..a368e2ef 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
- [Summary](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/branch/1.1/README.md)
-- [[tutorial v1.1_107] A Jinja conditional disabled boolean variable](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_107/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_107~1..v1.1_107))
+- [[tutorial v1.1_108] A variable in avanced mode](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_108/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_108~1..v1.1_108))
-# [tutorial v1.1_108] A variable in avanced mode
+# [tutorial v1.1_110] A boolean variable
-[View the diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_108~1..v1.1_108)
+[View the diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_110~1..v1.1_110)
-[Read the documentation](https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/jinja.html#a-variable-in-avanced-mode)
+[Read the documentation](https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/jinja.html#a-boolean-variable)
## Screenshot
@@ -31,7 +31,7 @@ pip install rougail-cli rougail-output-exporter rougail-output-doc rougail-user-
Then switch to the tutorial page:
```shell
-git switch --detach v1.1_108
+git switch --detach v1.1_110
```
## Structure
@@ -39,41 +39,31 @@ git switch --detach v1.1_108
-.
- ├── firefox
- │ ├── 00-proxy.yml
- │ ├── 10-manual.yml
- │ ├── 20-manual.yml
- │ ├── 30-auto.yml
- │ ├── 40-no_proxy.yml
- │ ├── 50-prompt_authentication.yml
- │ └── 55-proxy_dns_socks5.yml
- └── types
- └── proxy
- └── 00_type.yml
+.
+ ├── firefox
+ │ ├── 00-proxy.yml
+ │ ├── 10-manual.yml
+ │ ├── 20-manual.yml
+ │ ├── 30-auto.yml
+ │ ├── 40-no_proxy.yml
+ │ ├── 50-prompt_authentication.yml
+ │ ├── 55-proxy_dns_socks5.yml
+ │ └── 60-dns_over_https.yml
+ └── types
+ └── proxy
+ └── 00_type.yml
-Contents of the firefox/55-proxy_dns_socks5.yml file
+Contents of the firefox/60-dns_over_https.yml file
```yml
%YAML 1.2
---
version: 1.1
-proxy_dns_socks5:
- description: Use proxy DNS when using SOCKS v5
- mode: advanced
- default: false
- disabled:
- jinja: |-
- {% if _.manual.socks_proxy.version is propertyerror %}
- the proxy mode is not manual
- {% elif _.manual.socks_proxy.version == 'v4' %}
- socks version is v4
- {% endif %}
- description: |-
- if "firefox.proxy_mode" is not "Manual proxy configuration"
- or "firefox.manual.socks_proxy.version" is "v4"
+dns_over_https: # DNS over HTTPS
+
+ enable_dns_over_https: false # Enable DNS over HTTPS
...
```
@@ -145,6 +135,17 @@ rougail -m firefox/ --types types/proxy --modes_level basic standard advanced -o
| **prompt_authentication**
[`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | Prompt for authentication if password is saved.
**Default**: true
**Disabled**: when the variable "[Configure Proxy Access to the Internet](#proxy_mode)" has the value "No proxy" |
| **proxy_dns_socks5**
[`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `advanced` `mandatory` *`disabled`* | Use proxy DNS when using SOCKS v5.
**Default**: false
**Disabled**: if "firefox.proxy_mode" is not "Manual proxy configuration"
or "firefox.manual.socks_proxy.version" is "v4" |
+#### DNS over HTTPS
+
+> [!NOTE]
+>
+> **Path**: dns_over_https\
+> `standard`
+
+| Variable | Description |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------|
+| **dns_over_https.enable_dns_over_https**
[`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | Enable DNS over HTTPS.
**Default**: false |
+
***
### Let's generate the changelog
@@ -152,23 +153,11 @@ rougail -m firefox/ --types types/proxy --modes_level basic standard advanced -o
```shell
rougail -m firefox/ --types types/proxy --modes_level basic standard advanced -o doc --doc.contents changelog --doc.changelog.previous_json_file previous.yml
```
-#### Modified variables
+#### New variable
-| Variable | Description |
-|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **proxy_mode**
~~`(None, [], ['standard'])`~~ [`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `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.http_proxy.address**
~~`(None, [], ['basic'])`~~ [`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | Proxy address.
**Validators**:
• type domainname
• the domain name can be an IP |
-| **manual.http_proxy.port**
~~`(None, [], ['standard'])`~~ [`port`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | Proxy 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 |
-| **manual.use_for_https**
~~`(None, [], ['standard'])`~~ [`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | Also use this proxy for HTTPS.
**Default**: true |
-| **manual.https_proxy.address**
~~`(None, [], ['standard'])`~~ [`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | Proxy address.
**Validators**:
• type domainname
• the domain name can be an IP
**Default**: the value of the variable "[Proxy address](#manual.http_proxy.address)" |
-| **manual.https_proxy.port**
~~`(None, [], ['standard'])`~~ [`port`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | Proxy 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**: the value of the variable "[Proxy port](#manual.http_proxy.port)" |
-| **manual.socks_proxy.address**
~~`(None, [], ['basic'])`~~ [`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | Proxy address.
**Validators**:
• type domainname
• the domain name can be an IP |
-| **manual.socks_proxy.port**
~~`(None, [], ['standard'])`~~ [`port`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | Proxy 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 |
-| **manual.socks_proxy.version**
~~`(None, [], ['standard'])`~~ [`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | SOCKS host version used by proxy.
**Choices**:
• v4
• v5 **← (default)** |
-| **auto**
~~`(None, [], ['basic'])`~~ [`web address`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` *`disabled`* | Automatic proxy configuration URL.
**Validators**:
• well-known ports (1 to 1023) are allowed
• registred ports (1024 to 49151) are allowed
• type domainname
• the domain name can be a hostname
**Disabled**: when the variable "[Configure Proxy Access to the Internet](#proxy_mode)" hasn't the value "Automatic proxy configuration URL" |
-| **no_proxy**
~~`(None, [], ['standard'])`~~ [`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` *`disabled`* `unique` | Address for which proxy will be desactivated.
Connections to localhost, 127.0.0.1/8 and ::1 are never proxied.
**Validators**:
• type domainname
• the domain name can starts by a dot
• the domain name can be a hostname
• the domain name can be an IP
• the domain name can be network in CIDR format
**Examples**:
• .mozilla.org
• .net.nz
• 192.168.1.0/24
**Disabled**: when the variable "[Configure Proxy Access to the Internet](#proxy_mode)" has the value "No proxy" |
-| **prompt_authentication**
~~`(None, [], ['standard'])`~~ [`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | Prompt for authentication if password is saved.
**Default**: true
**Disabled**: when the variable "[Configure Proxy Access to the Internet](#proxy_mode)" has the value "No proxy" |
-| **proxy_dns_socks5**
~~`(None, [], ['advanced'])`~~ [`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `advanced` `mandatory` *`disabled`* | Use proxy DNS when using SOCKS v5.
**Default**: false
**Disabled**: ~~if "[Configure Proxy Access to the Internet](#proxy_mode)" is not "Manual proxy configuration"
or "[SOCKS host version used by proxy](#manual.socks_proxy.version)" is "v4"~~
if "firefox.proxy_mode" is not "Manual proxy configuration"
or "firefox.manual.socks_proxy.version" is "v4" |
+| Variable | Description |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------|
+| **dns_over_https.enable_dns_over_https**
[`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | Enable DNS over HTTPS.
**Default**: false |
***
@@ -197,89 +186,10 @@ rougail -m firefox/ --types types/proxy --modes_level basic standard advanced -u
Variables:
- :notebook: proxy_mode (Configure Proxy Access to the Internet): No proxy
-
-***
-### Example 2
-
-#### config/02/config.yml
-
-
-```yml
----
-proxy_mode: Manual proxy configuration
-manual:
- http_proxy:
- address: http.proxy.net
-```
-
-***
-#### Output
-
-```shell
-rougail -m firefox/ --types types/proxy --modes_level basic standard advanced -u yaml -yf config/02/config.yml
-```
-> [!CAUTION]
->
-> - manual (Manual proxy configuration)
-> - socks_proxy (SOCKS Proxy)
-> - address (Proxy address): :stop_sign: mandatory variable but has no value
-
-***
-### Example 3
-
-#### config/03/config.yml
-
-
-```yml
----
-proxy_mode: Manual proxy configuration
-manual:
- http_proxy:
- address: http.proxy.net
-proxy_dns_socks5: true
-```
-
-***
-#### Output
-
-```shell
-rougail -m firefox/ --types types/proxy --modes_level basic standard advanced -u yaml -yf config/03/config.yml
-```
-> [!CAUTION]
->
-> - manual (Manual proxy configuration)
-> - socks_proxy (SOCKS Proxy)
-> - address (Proxy address): :stop_sign: mandatory variable but has no value
-
-***
-### Example 4
-
-#### config/04/config.yml
-
-
-```yml
----
-proxy_mode: Manual proxy configuration
-manual:
- http_proxy:
- address: http.proxy.net
- socks_proxy:
- version: v4
-```
-
-***
-#### Output
-
-```shell
-rougail -m firefox/ --types types/proxy --modes_level basic standard advanced -u yaml -yf config/04/config.yml
-```
-> [!CAUTION]
->
-> - manual (Manual proxy configuration)
-> - socks_proxy (SOCKS Proxy)
-> - address (Proxy address): :stop_sign: mandatory variable but has no value
+- :open_file_folder: dns_over_https (DNS over HTTPS)
+ - :notebook: enable_dns_over_https (Enable DNS over HTTPS): false
***
-- [[tutorial v1.1_110] A boolean variable](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_110/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_110~1..v1.1_110))
+- [[tutorial v1.1_111] A choice variable](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_111/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_111~1..v1.1_111))
diff --git a/config/01/output_ro.html b/config/01/output_ro.html
index bb585a60..002821d6 100644
--- a/config/01/output_ro.html
+++ b/config/01/output_ro.html
@@ -2,5 +2,7 @@
│ Variable Default value │
╰────────────────────────╯
Variables:
-┗━━ 📓 proxy_mode (Configure Proxy Access to the Internet): No proxy
+┣━━ 📓 proxy_mode (Configure Proxy Access to the Internet): No proxy
+┗━━ 📂 dns_over_https (DNS over HTTPS)
+ ┗━━ 📓 enable_dns_over_https (Enable DNS over HTTPS): false
diff --git a/config/02/cmd_ro.txt b/config/02/cmd_ro.txt
deleted file mode 100644
index 44796ffd..00000000
--- a/config/02/cmd_ro.txt
+++ /dev/null
@@ -1 +0,0 @@
-rougail -m firefox/ --types types/proxy --modes_level basic standard advanced -u yaml -yf config/02/config.yml
\ No newline at end of file
diff --git a/config/02/config.yml b/config/02/config.yml
deleted file mode 100644
index 135d8b3a..00000000
--- a/config/02/config.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-proxy_mode: Manual proxy configuration
-manual:
- http_proxy:
- address: http.proxy.net
diff --git a/config/02/output_ro.html b/config/02/output_ro.html
deleted file mode 100644
index 26749f46..00000000
--- a/config/02/output_ro.html
+++ /dev/null
@@ -1,5 +0,0 @@
-🛑 Caution
-┗━━ manual (Manual proxy configuration)
- ┗━━ socks_proxy (SOCKS Proxy)
- ┗━━ address (Proxy address): 🛑 mandatory variable but has no value
-
diff --git a/config/03/cmd_ro.txt b/config/03/cmd_ro.txt
deleted file mode 100644
index 88a842ba..00000000
--- a/config/03/cmd_ro.txt
+++ /dev/null
@@ -1 +0,0 @@
-rougail -m firefox/ --types types/proxy --modes_level basic standard advanced -u yaml -yf config/03/config.yml
\ No newline at end of file
diff --git a/config/03/config.yml b/config/03/config.yml
deleted file mode 100644
index d04e72ce..00000000
--- a/config/03/config.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-proxy_mode: Manual proxy configuration
-manual:
- http_proxy:
- address: http.proxy.net
-proxy_dns_socks5: true
diff --git a/config/03/output_ro.html b/config/03/output_ro.html
deleted file mode 100644
index 26749f46..00000000
--- a/config/03/output_ro.html
+++ /dev/null
@@ -1,5 +0,0 @@
-🛑 Caution
-┗━━ manual (Manual proxy configuration)
- ┗━━ socks_proxy (SOCKS Proxy)
- ┗━━ address (Proxy address): 🛑 mandatory variable but has no value
-
diff --git a/config/04/cmd_ro.txt b/config/04/cmd_ro.txt
deleted file mode 100644
index 6219b69f..00000000
--- a/config/04/cmd_ro.txt
+++ /dev/null
@@ -1 +0,0 @@
-rougail -m firefox/ --types types/proxy --modes_level basic standard advanced -u yaml -yf config/04/config.yml
\ No newline at end of file
diff --git a/config/04/config.yml b/config/04/config.yml
deleted file mode 100644
index 8ceca7bc..00000000
--- a/config/04/config.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-proxy_mode: Manual proxy configuration
-manual:
- http_proxy:
- address: http.proxy.net
- socks_proxy:
- version: v4
diff --git a/config/04/output_ro.html b/config/04/output_ro.html
deleted file mode 100644
index 26749f46..00000000
--- a/config/04/output_ro.html
+++ /dev/null
@@ -1,5 +0,0 @@
-🛑 Caution
-┗━━ manual (Manual proxy configuration)
- ┗━━ socks_proxy (SOCKS Proxy)
- ┗━━ address (Proxy address): 🛑 mandatory variable but has no value
-
diff --git a/firefox.png b/firefox.png
index 34e6c084..d368003e 100644
Binary files a/firefox.png and b/firefox.png differ
diff --git a/tree.html b/tree.html
index f618fb46..a46475fd 100644
--- a/tree.html
+++ b/tree.html
@@ -1,14 +1,15 @@
-.
- ├── firefox
- │ ├── 00-proxy.yml
- │ ├── 10-manual.yml
- │ ├── 20-manual.yml
- │ ├── 30-auto.yml
- │ ├── 40-no_proxy.yml
- │ ├── 50-prompt_authentication.yml
- │ └── 55-proxy_dns_socks5.yml
- └── types
- └── proxy
- └── 00_type.yml
+.
+ ├── firefox
+ │ ├── 00-proxy.yml
+ │ ├── 10-manual.yml
+ │ ├── 20-manual.yml
+ │ ├── 30-auto.yml
+ │ ├── 40-no_proxy.yml
+ │ ├── 50-prompt_authentication.yml
+ │ ├── 55-proxy_dns_socks5.yml
+ │ └── 60-dns_over_https.yml
+ └── types
+ └── proxy
+ └── 00_type.yml
\ No newline at end of file