Merge 129dddde5d9199b6204e93765dd1a74694e401f0 into f229480a625eac4af6b17f1cfb7e7bf121001ff6

DNS: move Pi-Hole from awesome-sysadmin/DNS Control Panels & Domain Managament (#3942 )
- Since the section is now about DNS-based ad blockers specifically
2025-01-17 23:00:35 +00:00 · 2023-06-29 15:34:23 +08:00 · 2023-06-28 23:01:08 +00:00 · 2023-06-28 22:58:41 +00:00 · 2023-06-28 22:52:50 +00:00 · 2023-06-28 22:45:28 +00:00
1 changed files with 4 additions and 8 deletions
--- a/README.md
+++ b/README.md
@ -750,17 +750,14 @@ _See also: [dbdb.io - Database of Databases](https://dbdb.io/)_
 **[`^        back to top        ^`](#awesome-selfhosted)**
-[DNS](https://en.wikipedia.org/wiki/Domain_Name_System) servers and management tools.
+[DNS](https://en.wikipedia.org/wiki/Domain_Name_System) servers and management tools with advertisement blocking funtionality, primarly aimed at home or small networks.
-_See also: [awesome-sysadmin/DNS](https://github.com/awesome-foss/awesome-sysadmin#dns)_
+_See also: [awesome-sysadmin/DNS - Servers](https://github.com/awesome-foss/awesome-sysadmin#dns---servers), [awesome-sysadmin/DNS - Control Panels & Domain Management](https://github.com/awesome-foss/awesome-sysadmin#dns---control-panels--domain-management)_
 - [blocky](https://github.com/0xERR0R/blocky) - Fast and lightweight DNS proxy (like Pi-hole) as ad-blocker for local network with many features. `Apache-2.0` `Go`
 - [CoreDNS](https://coredns.io/) - Plugin driven DNS Server with support for proxying to Google's DNS-over-HTTPS. ([Source Code](https://github.com/coredns/coredns)) `Apache-2.0` `Go`
 - [Maza ad blocking](https://maza-ad-blocking.andros.dev/) - Local ad blocker. Like Pi-hole but local and using your operating system. ([Source Code](https://github.com/tanrax/maza-ad-blocking)) `Apache-2.0` `Bash`
- [nsupdate.info](https://www.nsupdate.info/) - Dynamic DNS service. ([Demo](https://www.nsupdate.info/account/register/), [Source Code](https://github.com/nsupdate-info/nsupdate.info)) `BSD-3-Clause` `Python`
+- [Pi-hole](https://pi-hole.net/) - A blackhole for Internet qdvertisements with a GUI for management and monitoring. ([Source Code](https://github.com/pi-hole/pi-hole)) `EUPL-1.2` `Shell/PHP`
- [SmartDNS](https://github.com/pymumu/smartdns) - A local DNS server to obtain the fastest website IP for the best Internet experience, supports DoT, DoH. `GPL-3.0` `C`
+- [Technitium DNS Server](https://technitium.com/dns/) - Authoritative/recursive DNS server with ad blocking functionality. ([Source Code](https://github.com/TechnitiumSoftware/DnsServer)) `GPL-3.0` `Docker/C#`
 - [SPF Toolbox](https://spftoolbox.com) - Application to look up DNS records such as SPF, MX, Whois, and more. ([Source Code](https://github.com/charlesabarnes/SPFtoolbox)) `MIT` `PHP`
 - [Technitium DNS Server](https://technitium.com/dns/) - An open source authoritative as well as recursive DNS server that can be used for self hosting a DNS server for privacy & security. ([Source Code](https://github.com/TechnitiumSoftware/DnsServer)) `GPL-3.0` `Docker/C#`
 ### Document Management
@ -1991,7 +1988,6 @@ _Related: [Software Development - Project Management](#software-development---pr
 - [Tasks.md](https://github.com/BaldissaraMatheus/Tasks.md) - A self-hosted, file based task management board that supports Markdown syntax. `MIT` `Docker`
 - [Taskwarrior](https://taskwarrior.org/) - Taskwarrior is Free and Open Source Software that manages your TODO list from your command line. It is flexible, fast, efficient, and unobtrusive. It does its job then gets out of your way. ([Source Code](https://taskwarrior.org/download/#git)) `MIT` `C++`
 - [todo](https://git.mills.io/prologic/todo) - Simple todo list manager. ([Demo](https://todo.mills.io)) `MIT` `Go`
 - [todoMini](https://www.todomini.app/) - Mobile friendly zero-feature TODO list web app. Unix philosophy. ([Demo](https://appmini.github.io/todoMini/?demo), [Source Code](https://github.com/appMini/todoMini)) `GPL-3.0` `PHP/Java`
 - [Tracks](https://www.getontracks.org/) - Web-based application to help you implement David Allen’s [Getting Things Done™](https://en.wikipedia.org/wiki/Getting_Things_Done) methodology. ([Source Code](https://github.com/TracksApp/tracks)) `GPL-2.0` `Ruby`
 - [Vikunja](https://vikunja.io/) - The to-do app to organize your life. ([Demo](https://try.vikunja.io/login), [Source Code](https://kolaente.dev/vikunja/)) `GPL-3.0` `Go`
 - [Wekan](https://wekan.github.io/) - Open-source Trello-like kanban. ([Source Code](https://github.com/wekan/wekan)) `MIT` `Nodejs`
Author	SHA1	Message	Date
Rabenherz112	c00fd0786a	Merge 129dddde5d9199b6204e93765dd1a74694e401f0 into f229480a625eac4af6b17f1cfb7e7bf121001ff6	2023-06-29 15:34:23 +08:00
nodiscc	f229480a62	DNS: move Pi-Hole from awesome-sysadmin/DNS Control Panels & Domain Managament (#3942 ) - Since the section is now about DNS-based ad blockers specifically	2023-06-28 23:01:08 +00:00
nodiscc	1b68828744	DNS: clarify that the section is about DNS-based ad blockers (#3941 ) - DNS servers or other management tools should be added to https://github.com/awesome-foss/awesome-sysadmin#dns---servers or https://github.com/awesome-foss/awesome-sysadmin#dns---control-panels--domain-management instead	2023-06-28 22:58:41 +00:00
nodiscc	f637a50de0	DNS: move nsupdate.info/SPF toolbox to awesome-sysadmin/DNS - Control Panels & Domain Management (#3940 ) - ref. https://github.com/awesome-foss/awesome-sysadmin/pull/504 - ref. https://github.com/awesome-foss/awesome-sysadmin/pull/473 - ref. https://github.com/awesome-selfhosted/awesome-selfhosted/pull/3938	2023-06-28 22:52:50 +00:00
nodiscc	207aee05d0	DNS: fix links to awesome-sysadmin (#3939 ) The DNS section was split to Servers/Control Panels & Domain management subsections	2023-06-28 22:45:28 +00:00
nodiscc	3ce8ced520	Remove CoreDNS (already listed at awesome-sysadmin) (#3938 ) - https://github.com/awesome-foss/awesome-sysadmin#dns---servers	2023-06-28 22:41:26 +00:00
Rabenherz112	129dddde5d	Remove todoMini (unmaintained since 2022, website down)	2023-06-24 16:30:42 +02:00