diff --git a/CHANGELOG.md b/CHANGELOG.md index a1004a23..0ae489b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # New variable -| Variable | Description | -|------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **auto**
[`web address`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `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". | +| Variable | Description | +|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **no_proxy**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` *`disabled`* | Address for which proxy will be desactivated.
**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
**Disabled**: when the variable "[Configure Proxy Access to the Internet](#proxy_mode)" has the value "No proxy". | diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index bca27466..4a5e2dec 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -50,6 +50,7 @@ | **manual.socks_proxy.port**
[`port`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | SOCKS 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 "[HTTP proxy port](#manual.http_proxy.port)". | | **manual.socks_proxy.version**
[`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | SOCKS host version used by proxy.
**Choices**:
• v4
• v5 **← (default)** | -| Variable | Description | -|------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **auto**
[`web address`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `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". | +| Variable | Description | +|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **auto**
[`web address`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `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**
[`domainname`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` *`disabled`* | Address for which proxy will be desactivated.
**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
**Disabled**: when the variable "[Configure Proxy Access to the Internet](#proxy_mode)" has the value "No proxy". | diff --git a/README.md b/README.md index f443508f..ea02a73b 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_083] Redefine other parameter in custom type](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_083/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_090~1..v1.1_090)) +- [[tutorial v1.1_090] A conditional disabled variable with type web_address](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_090/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_100~1..v1.1_100)) -# [tutorial v1.1_090] A conditional disabled variable with type web_address +# [tutorial v1.1_100] A conditional disabled variable with type domainname and parameters -[Read the tutorial "A conditional disabled variable with type web_address" in the documentation](https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/jinja.html#a-conditional-disabled-variable-with-type-web_address) +[Read the tutorial "A conditional disabled variable with type domainname and parameters" in the documentation](https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/jinja.html#a-conditional-disabled-variable-with-type-domainname-and-parameters) ## Screenshot @@ -25,36 +25,42 @@ pip install rougail-cli rougail-output-exporter rougail-output-doc rougail-user- Then switch to the tutorial page: ```shell -git switch --detach v1.1_090 +git switch --detach v1.1_100 ``` ## Structure

-.
- ├── firefox
- │   ├── 00-proxy.yml
- │   ├── 10-manual.yml
- │   ├── 20-manual.yml
- │   └── 30-auto.yml
- └── types
-     └── proxy
-         └── 00-type.yml
+.
+ ├── firefox
+ │   ├── 00-proxy.yml
+ │   ├── 10-manual.yml
+ │   ├── 20-manual.yml
+ │   ├── 30-auto.yml
+ │   └── 40-no_proxy.yml
+ └── types
+     └── proxy
+         └── 00-type.yml


-Contents of the firefox/30-auto.yml file +Contents of the firefox/40-no_proxy.yml file ```yml %YAML 1.2 --- version: 1.1 -auto: - description: Automatic proxy configuration URL - type: web_address +no_proxy: + description: Address for which proxy will be desactivated + type: domainname + params: + allow_ip: true + allow_cidr_network: true + allow_without_dot: true + allow_startswith_dot: true disabled: variable: _.proxy_mode - when_not: Automatic proxy configuration URL + when: No proxy ... ``` @@ -86,7 +92,6 @@ rougail -m firefox/ --types types/proxy -o doc --doc.contents changelog --doc.ch ```yml --- -auto: https://auto.proxy.net/wpad.dat ``` *** @@ -95,10 +100,6 @@ auto: https://auto.proxy.net/wpad.dat ```shell rougail -m firefox/ --types types/proxy -u yaml -yf config/01/config.yml ``` -> [!WARNING] -> -> - auto (Automatic proxy configuration URL): :bell: variable has property disabled, it will be ignored when loading from the YAML file "config/01/config.yml" - > [!NOTE] > > **Caption:** @@ -117,6 +118,8 @@ Variables: ```yml --- proxy_mode: Automatic proxy configuration URL +auto: https://auto.proxy.net/wpad.dat +no_proxy: 192.168.1.0/24 ``` *** @@ -125,28 +128,6 @@ proxy_mode: Automatic proxy configuration URL ```shell rougail -m firefox/ --types types/proxy -u yaml -yf config/02/config.yml ``` -> [!CAUTION] -> -> - auto (Automatic proxy configuration URL): :stop_sign: mandatory variable but has no value - -*** -### Example 3 - -#### config/03/config.yml - - -```yml ---- -proxy_mode: Automatic proxy configuration URL -auto: https://auto.proxy.net/wpad.dat -``` - -*** -#### Output - -```shell -rougail -m firefox/ --types types/proxy -u yaml -yf config/03/config.yml -``` > [!NOTE] > > **Caption:** @@ -155,10 +136,11 @@ rougail -m firefox/ --types types/proxy -u yaml -yf config/03/config.yml > - (:hourglass_flowing_sand: Original default value) Variables: -- :notebook: proxy_mode (Configure Proxy Access to the Internet): Automatic proxy configuration URL ← loaded from the YAML file "config/03/config.yml" (:hourglass_flowing_sand: No proxy) -- :notebook: auto (Automatic proxy configuration URL): https://auto.proxy.net/wpad.dat ← loaded from the YAML file "config/03/config.yml" +- :notebook: proxy_mode (Configure Proxy Access to the Internet): Automatic proxy configuration URL ← loaded from the YAML file "config/02/config.yml" (:hourglass_flowing_sand: No proxy) +- :notebook: auto (Automatic proxy configuration URL): https://auto.proxy.net/wpad.dat ← loaded from the YAML file "config/02/config.yml" +- :notebook: no_proxy (Address for which proxy will be desactivated): 192.168.1.0/24 ← loaded from the YAML file "config/02/config.yml" *** -- [[tutorial v1.1_100] A conditional disabled variable with type domainname and parameters](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_100/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_100~1..v1.1_100)) +- [[tutorial v1.1_101] A variable with multiple value](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)) diff --git a/config/01/config.yml b/config/01/config.yml index 1edbe913..ed97d539 100644 --- a/config/01/config.yml +++ b/config/01/config.yml @@ -1,2 +1 @@ --- -auto: https://auto.proxy.net/wpad.dat diff --git a/config/01/output_ro.html b/config/01/output_ro.html index 7f2d1085..bb585a60 100644 --- a/config/01/output_ro.html +++ b/config/01/output_ro.html @@ -1,8 +1,4 @@ -
🔔 Warning
-┗━━ auto (Automatic proxy configuration URL): 🔔 variable has property disabled,
-    it will be ignored when loading from the YAML file "config/01/config.yml"
-
-╭─────── Caption ────────╮
+
╭─────── Caption ────────╮
 │ Variable Default value │
 ╰────────────────────────╯
 Variables:
diff --git a/config/02/config.yml b/config/02/config.yml
index 26df1306..54956ea6 100644
--- a/config/02/config.yml
+++ b/config/02/config.yml
@@ -1,2 +1,4 @@
 ---
 proxy_mode: Automatic proxy configuration URL
+auto: https://auto.proxy.net/wpad.dat
+no_proxy: 192.168.1.0/24
diff --git a/config/02/output_ro.html b/config/02/output_ro.html
index 3f84fbd9..02135a2a 100644
--- a/config/02/output_ro.html
+++ b/config/02/output_ro.html
@@ -1,4 +1,13 @@
-
🛑 Caution
-┗━━ auto (Automatic proxy configuration URL): 🛑 mandatory variable but has no 
-    value
+
╭────────────── Caption ───────────────╮
+│ Variable Modified value              │
+│          (⏳ Original default value) │
+╰──────────────────────────────────────╯
+Variables:
+┣━━ 📓 proxy_mode (Configure Proxy Access to the Internet): Automatic proxy 
+┃   configuration URL ◀ loaded from the YAML file "config/02/config.yml" (⏳ No 
+┃   proxy)
+┣━━ 📓 auto (Automatic proxy configuration URL): https://auto.proxy.net/wpad.dat
+┃   ◀ loaded from the YAML file "config/02/config.yml"
+┗━━ 📓 no_proxy (Address for which proxy will be desactivated): 192.168.1.0/24 ◀
+    loaded from the YAML file "config/02/config.yml"
 

diff --git a/config/03/cmd_ro.txt b/config/03/cmd_ro.txt
deleted file mode 100644
index 3c55adcb..00000000
--- a/config/03/cmd_ro.txt
+++ /dev/null
@@ -1 +0,0 @@
-rougail -m firefox/ --types types/proxy -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 307e175b..00000000
--- a/config/03/config.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-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
deleted file mode 100644
index 7fe00597..00000000
--- a/config/03/output_ro.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
╭────────────── Caption ───────────────╮
-│ Variable Modified value              │
-│          (⏳ Original default value) │
-╰──────────────────────────────────────╯
-Variables:
-┣━━ 📓 proxy_mode (Configure Proxy Access to the Internet): Automatic proxy 
-┃   configuration URL ◀ loaded from the YAML file "config/03/config.yml" (⏳ No 
-┃   proxy)
-┗━━ 📓 auto (Automatic proxy configuration URL): https://auto.proxy.net/wpad.dat
-    ◀ loaded from the YAML file "config/03/config.yml"
-

diff --git a/firefox.png b/firefox.png
index d53e5138..16f5931c 100644
Binary files a/firefox.png and b/firefox.png differ
diff --git a/tree.html b/tree.html
index 708426b0..69e17d9d 100644
--- a/tree.html
+++ b/tree.html
@@ -1,11 +1,12 @@
 

-.

-	├── firefox

-	│   ├── 00-proxy.yml

-	│   ├── 10-manual.yml

-	│   ├── 20-manual.yml

-	│   └── 30-auto.yml

-	└── types

-	    └── proxy

-	        └── 00-type.yml

+.

+	├── firefox

+	│   ├── 00-proxy.yml

+	│   ├── 10-manual.yml

+	│   ├── 20-manual.yml

+	│   ├── 30-auto.yml

+	│   └── 40-no_proxy.yml

+	└── types

+	    └── proxy

+	        └── 00-type.yml

 


\ No newline at end of file