[PR #409] [MERGED] Option to not comment out existing nameservers from resolv.conf #479

Closed
opened 2026-02-26 04:35:23 +03:00 by kerem · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/mageddo/dns-proxy-server/pull/409
Author: @mageddo
Created: 4/5/2023
Status: Merged
Merged: 4/5/2023
Merged by: @mageddo

Base: masterHead: feat/386


📝 Commits (10+)

📊 Changes

24 files changed (+202 additions, -31 deletions)

View changed files

📝 .gitignore (+1 -1)
📝 RELEASE-NOTES.md (+1 -0)
📝 docs/content/3-configuration/_index.en.md (+13 -11)
📝 gradle.properties (+1 -1)
📝 src/main/java/com/mageddo/dnsproxyserver/config/Config.java (+2 -0)
📝 src/main/java/com/mageddo/dnsproxyserver/config/Configs.java (+3 -0)
📝 src/main/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigEnv.java (+4 -0)
📝 src/main/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigFlag.java (+11 -1)
📝 src/main/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJson.java (+2 -0)
📝 src/main/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1.java (+5 -0)
📝 src/main/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV2.java (+2 -0)
📝 src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ConfigureDPSHandler.java (+0 -2)
📝 src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinux.java (+7 -2)
📝 src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfigurator.java (+9 -2)
src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfigureDPSHandler.java (+57 -0)
📝 src/test/java/com/mageddo/dnsproxyserver/config/ConfigsTest.java (+5 -5)
📝 src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfiguratorTest.java (+63 -1)
📝 src/test/resources/config-json-v1-test/002.json (+1 -0)
📝 src/test/resources/configs-test/001.json (+1 -0)
📝 src/test/resources/configs-test/002.json (+1 -0)

...and 4 more files

📄 Description

Relates to #386


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/mageddo/dns-proxy-server/pull/409 **Author:** [@mageddo](https://github.com/mageddo) **Created:** 4/5/2023 **Status:** ✅ Merged **Merged:** 4/5/2023 **Merged by:** [@mageddo](https://github.com/mageddo) **Base:** `master` ← **Head:** `feat/386` --- ### 📝 Commits (10+) - [`eaaf97e`](https://github.com/mageddo/dns-proxy-server/commit/eaaf97eb3f3dfe0a075958f777005bed0a322fd1) creating test - [`23e262d`](https://github.com/mageddo/dns-proxy-server/commit/23e262db9b37cb0907f74d33dd8ff793db4a7127) partially implementing - [`d052c5e`](https://github.com/mageddo/dns-proxy-server/commit/d052c5eaf4ac06fdf87f8fb13f8049b700b16115) tests are passing - [`0026d70`](https://github.com/mageddo/dns-proxy-server/commit/0026d7072fb27184e813fe4456518c13f5dc6393) Fixing scenario - [`2b97cf9`](https://github.com/mageddo/dns-proxy-server/commit/2b97cf9dac8c971a19de78613dbc76de28dbc368) Creating new configuration - [`13793d8`](https://github.com/mageddo/dns-proxy-server/commit/13793d87098e0f6418f9ef18e4adb8ed939f249d) adjusting tests - [`195418b`](https://github.com/mageddo/dns-proxy-server/commit/195418b9d00c825d00716ae4cd76b5a13a706c0d) adjusting tests - [`078f0bf`](https://github.com/mageddo/dns-proxy-server/commit/078f0bfbd26505a9b9fe4c28186b23f8547045df) adjusting tests - [`cb9dfe1`](https://github.com/mageddo/dns-proxy-server/commit/cb9dfe151dbf7e902a2985a296e44aaaa5119f71) adjusting tests - [`fc239bc`](https://github.com/mageddo/dns-proxy-server/commit/fc239bc0c61c0edadee4374ed6cbe87cedc5d0b1) adjusting gitignore ### 📊 Changes **24 files changed** (+202 additions, -31 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+1 -1) 📝 `RELEASE-NOTES.md` (+1 -0) 📝 `docs/content/3-configuration/_index.en.md` (+13 -11) 📝 `gradle.properties` (+1 -1) 📝 `src/main/java/com/mageddo/dnsproxyserver/config/Config.java` (+2 -0) 📝 `src/main/java/com/mageddo/dnsproxyserver/config/Configs.java` (+3 -0) 📝 `src/main/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigEnv.java` (+4 -0) 📝 `src/main/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigFlag.java` (+11 -1) 📝 `src/main/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJson.java` (+2 -0) 📝 `src/main/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1.java` (+5 -0) 📝 `src/main/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV2.java` (+2 -0) 📝 `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ConfigureDPSHandler.java` (+0 -2) 📝 `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinux.java` (+7 -2) 📝 `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfigurator.java` (+9 -2) ➕ `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfigureDPSHandler.java` (+57 -0) 📝 `src/test/java/com/mageddo/dnsproxyserver/config/ConfigsTest.java` (+5 -5) 📝 `src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfiguratorTest.java` (+63 -1) 📝 `src/test/resources/config-json-v1-test/002.json` (+1 -0) 📝 `src/test/resources/configs-test/001.json` (+1 -0) 📝 `src/test/resources/configs-test/002.json` (+1 -0) _...and 4 more files_ </details> ### 📄 Description Relates to #386 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
kerem 2026-02-26 04:35:23 +03:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/dns-proxy-server-mageddo#479
No description provided.