Merge pull request #6 from Cielquan/fallback

Fallback
Cielquan · Dec 11, 2019 · 407f98c · 407f98c
2 parents 7995cdb + dfac3f9
commit 407f98c
Show file tree

Hide file tree

Showing 3 changed files with 206 additions and 288 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # DoTH DNS Change Log
 
+**Release 5.3.0** - 11.12.2019
+- Reworked config gathering in script and added fallback mechanism ([commit](https://github.com/Cielquan/DoTH-DNS/commit/30a33776a36d2fc44465710c8335958248b1ad37))
+- Added `-F` flag for fallback option ([commit](https://github.com/Cielquan/DoTH-DNS/commit/ef9677ef8d089ca5b5ad6e221b8601cc1c5e0c4d))
+- Minor code improvements in script
+- Updated README ([commit](https://github.com/Cielquan/DoTH-DNS/commit/359eed77a263d1d0efd82444f1d33aaaf5ad05cd))
+
 **Release 5.2.1** - 30.11.2019
 - Added missing hint for `whiptail` in README ([commit](https://github.com/Cielquan/DoTH-DNS/commit/f389e3ab123a64066b67acaf2a33c6a80bf1c139))
 

diff --git a/README.md b/README.md
@@ -107,6 +107,8 @@ Here is an overview of the available flags for setup when calling the script. Ru
 
 * `-f`): If set then old configuration settings saved in `.env` file will not be loaded and a new `root.hints` file will be downloaded.
 
+* `-F`): Set to let the script fallback to next source for configuration variables. Order: `flag -> environment -> .env file -> self gather`
+
 * `-a`): Set Architecture of the processor ('arm' or 'x86') used by the server. Needed for determining the right docker images. If not set script will determine it. 
 
 * `-c`): Set to force `goofball222/dns-over-https` docker image to be compiled. If not set then the `ARCHITECTURE` determines if the image will be compiled