starred/dns-proxy-server-mageddo
1
0
Fork 0
mirror of https://github.com/mageddo/dns-proxy-server.git synced 2026-04-25 09:25:56 +03:00
Code Issues 10 Projects Releases 10 Packages Wiki Activity

[PR #322] [MERGED] Multiple resolvconf paths support #420

New issue
Closed
opened 2026-02-26 04:35:11 +03:00 by kerem · 0 comments
kerem commented 2026-02-26 04:35:11 +03:00
Owner
Copy link

📋 Pull Request Information

Original PR: https://github.com/mageddo/dns-proxy-server/pull/322
Author: @mageddo
Created: 2/25/2023
Status: ✅ Merged
Merged: 2/25/2023
Merged by: @mageddo

Base: master ← Head: systemd-resolved

📝 Commits (10+)

📊 Changes

22 files changed (+363 additions, -41 deletions)

View changed files

📝 RELEASE-NOTES.md (+9 -0)
📝 docker-compose-dev.yml (+6 -0)
📝 gradle.properties (+1 -1)
📝 src/main/java/com/mageddo/dnsproxyserver/config/Config.java (+1 -1)
📝 src/main/java/com/mageddo/dnsproxyserver/config/Configs.java (+2 -2)
📝 src/main/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigEnv.java (+3 -4)
📝 src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfigurators.java (+3 -3)
📝 src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxDnsConfigurator.java (+72 -8)
➕ src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxResolverConfDetector.java (+60 -0)
➕ src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvFile.java (+22 -0)
📝 src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/resolvconf/DnsServerCleanerHandler.java (+1 -1)
📝 src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/resolvconf/SetMachineDNSServerHandler.java (+1 -1)
📝 src/main/java/com/mageddo/dnsproxyserver/docker/DpsContainer.java (+2 -1)
📝 src/main/java/com/mageddo/dnsproxyserver/utils/Envs.java (+4 -0)
➕ src/main/java/com/mageddo/dnsproxyserver/utils/Splits.java (+27 -0)
📝 src/main/java/com/mageddo/utils/Files.java (+17 -1)
📝 src/test/java/com/mageddo/dnsproxyserver/config/ConfigsTest.java (+1 -1)
📝 src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxDnsConfiguratorTest.java (+51 -12)
➕ src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxResolverConfDetectorTest.java (+76 -0)
📝 src/test/java/com/mageddo/dnsproxyserver/templates/ConfigTemplates.java (+2 -1)

...and 2 more files

📄 Description

Based on #321 , it fixes

2 => MG_RESOLVCONF will now accept more than one value
3 => The default value of MG_RESOLVCONF will changes to ...

🔄 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/322 **Author:** [@mageddo](https://github.com/mageddo) **Created:** 2/25/2023 **Status:** ✅ Merged **Merged:** 2/25/2023 **Merged by:** [@mageddo](https://github.com/mageddo) **Base:** `master` ← **Head:** `systemd-resolved` --- ### 📝 Commits (10+) - [`3ee606a`](https://github.com/mageddo/dns-proxy-server/commit/3ee606a3c38c1c0f84520e704a6bf9a450468ddb) drafts, just drafts - [`0be7cb0`](https://github.com/mageddo/dns-proxy-server/commit/0be7cb0fc948ddf9348dce0ce001a2e354e0bd03) initial work to make it possible to pass multiple resolv conf files - [`430126b`](https://github.com/mageddo/dns-proxy-server/commit/430126b09a6e4628e9b52a6360b55e0452e32102) working to fix the tests - [`d217c3e`](https://github.com/mageddo/dns-proxy-server/commit/d217c3e60b530d00627bb78e01b80f7abbd3ecc7) creating type detector - [`cd268a6`](https://github.com/mageddo/dns-proxy-server/commit/cd268a6bff242111c5876153570b7e46d71ca515) tests were fixed - [`3be4321`](https://github.com/mageddo/dns-proxy-server/commit/3be4321aaa01090453be8a7e06962ebebc895b08) testing resolv conf decision - [`feb8e29`](https://github.com/mageddo/dns-proxy-server/commit/feb8e29d6ebe98e353db80812c77a7fcc61b9500) fixing tess - [`a5c1f1d`](https://github.com/mageddo/dns-proxy-server/commit/a5c1f1d32bfc0596dfc90201050002ac82cecc89) fixing tess - [`3788f22`](https://github.com/mageddo/dns-proxy-server/commit/3788f228b980e5c21afabe22c49c2e35cadfcf95) add volatile hint - [`575e703`](https://github.com/mageddo/dns-proxy-server/commit/575e7032195181900617bad3722d8893fb6b6811) systemd resolved detector ### 📊 Changes **22 files changed** (+363 additions, -41 deletions) <details> <summary>View changed files</summary> 📝 `RELEASE-NOTES.md` (+9 -0) 📝 `docker-compose-dev.yml` (+6 -0) 📝 `gradle.properties` (+1 -1) 📝 `src/main/java/com/mageddo/dnsproxyserver/config/Config.java` (+1 -1) 📝 `src/main/java/com/mageddo/dnsproxyserver/config/Configs.java` (+2 -2) 📝 `src/main/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigEnv.java` (+3 -4) 📝 `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfigurators.java` (+3 -3) 📝 `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxDnsConfigurator.java` (+72 -8) ➕ `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxResolverConfDetector.java` (+60 -0) ➕ `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvFile.java` (+22 -0) 📝 `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/resolvconf/DnsServerCleanerHandler.java` (+1 -1) 📝 `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/resolvconf/SetMachineDNSServerHandler.java` (+1 -1) 📝 `src/main/java/com/mageddo/dnsproxyserver/docker/DpsContainer.java` (+2 -1) 📝 `src/main/java/com/mageddo/dnsproxyserver/utils/Envs.java` (+4 -0) ➕ `src/main/java/com/mageddo/dnsproxyserver/utils/Splits.java` (+27 -0) 📝 `src/main/java/com/mageddo/utils/Files.java` (+17 -1) 📝 `src/test/java/com/mageddo/dnsproxyserver/config/ConfigsTest.java` (+1 -1) 📝 `src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxDnsConfiguratorTest.java` (+51 -12) ➕ `src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxResolverConfDetectorTest.java` (+76 -0) 📝 `src/test/java/com/mageddo/dnsproxyserver/templates/ConfigTemplates.java` (+2 -1) _...and 2 more files_ </details> ### 📄 Description Based on #321 , it fixes > 2 => MG_RESOLVCONF will now accept more than one value > 3 => The default value of MG_RESOLVCONF will changes to ... --- <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:11 +03:00
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
master
gh-pages
develop
feat/138_2
feat/629
feat/594
5.9.0
5.9.0-snapshot
5.8.4
5.8.4-snapshot
5.8.3-snapshot
5.8.2-snapshot
5.8.1-snapshot
5.8.0-snapshot
5.7.0-snapshot
5.6.2-snapshot
5.6.1-snapshot
5.6.0-snapshot
5.5.1-snapshot
5.5.0-snapshot
5.4.0-snapshot
5.3.0-snapshot
5.2.0-snapshot
5.1.3-snapshot
5.1.2-snapshot
5.1.0-snapshot
5.0.5-snapshot
5.0.3-snapshot
5.0.2-snapshot
5.0.1-snapshot
5.0.0-snapshot
4.3.0-snapshot
4.2.0-snapshot
4.0.0
4.0.0-snapshot
3.32.7
3.32.7-snapshot
3.32.6
3.32.6-snapshot
3.32.5-snapshot
3.32.4
3.32.4-snapshot
3.32.3
3.32.3-snapshot
3.32.2-snapshot
3.32.1-snapshot
3.32.0-snapshot
3.31.1-snapshot
3.31.0-snapshot
3.30.5-snapshot
3.30.4
3.30.4-snapshot
3.30.3-snapshot
3.30.2-snapshot
3.30.1
3.30.1-snapshot
3.30.0-snapshot
3.29.0-snapshot
3.27.0
3.27.0-snapshot
3.26.0-snapshot
3.25.14
3.25.14-snapshot
3.25.13-snapshot
3.25.12-snapshot
3.25.11
3.25.11-snapshot
3.25.10
3.25.10-snapshot
3.25.9-snapshot
3.25.8-snapshot
3.25.7-snapshot
3.25.6-snapshot
3.25.4-snapshot
3.25.3-snapshot
3.25.2-snapshot
3.25.1-snapshot
3.25.0-snapshot
3.24.2
3.24.2-snapshot
3.24.1
3.24.1-snapshot
3.24.0-snapshot
3.23.0-snapshot
3.22.2-snapshot
3.22.3-snapshot
3.22.1-snapshot
3.21.3-snapshot
3.22.0-snapshot
3.21.2-snapshot
3.21.1-snapshot
3.20.0-snapshot
3.21.0-snapshot
3.19.7-snapshot
3.19.6-snapshot
3.19.5-snapshot
3.19.4-snapshot
3.19.3-snapshot
3.19.2-snapshot
3.19.1
3.19.1-snapshot
3.19.0
3.18.5-snapshot
3.18.4-snapshot
3.18.3-snapshot
3.18.2
3.18.2-snapshot
3.18.1-snapshot
3.18.0-snapshot
3.17.3-snapshot
3.17.2-snapshot
3.17.1-snapshot
3.17.0-snapshot
3.16.3-snapshot
3.16.2-snapshot
3.16.1-snapshot
3.16.0-snapshot
3.15.13-snapshot
3.15.12-snapshot
3.15.11-snapshot
3.15.10-snapshot
3.15.9-snapshot
3.15.8-snapshot
3.15.7-snapshot
3.15.6-snapshot
3.15.5-snapshot
3.15.4-snapshot
3.15.3-snapshot
3.15.2-snapshot
3.15.1-snapshot
3.15.0-snapshot
3.14.5
3.14.4
3.14.3
3.14.3-snapshot
3.14.2-snapshot
3.14.1-snapshot
3.14.0-snapshot
3.13.1
3.13.1-snapshot
3.13.0-snapshot
3.12.1
3.12.0
3.11.0
3.10.2-snapshot
3.10.3-snapshot
3.10.4-snapshot
3.10.5-snapshot
3.10.1-snapshot
3.9.2
3.9.1
3.9.0
3.8.1-last-version-with-quarkus
3.8.1
3.8.0
3.7.0
3.6.0
3.5.3
3.5.2
3.5.0
3.4.0-beta
3.3.0-beta
3.2.5-beta
3.2.4-beta
3.2.3-beta
3.2.2-beta
3.2.1-beta
3.2.0-beta
3.1.7-beta
3.1.6-beta
3.1.5-beta
3.1.4-beta
3.1.3-beta
3.1.2-beta
b-jre-8
3.1.1-beta
3.1.0-beta
3.0.4-beta
3.0.3-beta
3.0.2-beta
3.0.1-beta
v2-golang
2.19.5
2.19.4
2.19.3
2.19.2
2.19.1
2.19.0
2.18.7
2.18.6
2.18.5
2.18.4
2.18.3
2.18.2
2.18.1
2.18.0
2.17.4
2.17.3
2.17.2
2.17.1
2.17.0
2.16.0
2.15.0
2.14.6
2.14.5
2.14.4
2.14.2
2.14.1
2.14.0
2.13.2
2.13.1
2.13.0
2.12.0
2.11.0
2.10.4
2.10.3
2.10.2
2.10.1
2.10.0
2.9.1
2.9.0
2.8.0
2.7.0
2.6.1
2.6.0
2.5.4
2.5.3
2.5.2
2.5.1
2.5.0
2.4.1
2.4.0
2.3.3
2.2.3
2.2.2
2.2.1
2.2.0
2.1.8
2.1.7
2.1.6
2.1.5
2.1.2
2.1.1
2.1.0
2.0.21
2.0.20
2.0.19
2.0.18
2.0.17
2.0.16
2.0.9
2.0.5
2.0.4
v1-nodejs
1.8.1
1.8.0
1.7.7
1.7.6
1.7.5
1.7.4
1.7.3
1.7.2
1.7.1
1.7.0
1.6.9
1.6.8
1.6.7
1.6.6
1.6.5
1.6.4
1.6.3
1.6.2
1.6.1
1.6.0
1.5.0
1.4.0
1.3.5
1.3.4
1.3.3
1.3.2
1.3.1
1.3.0
peteris-version
1.1.4-peteris-version
1.2.0
1.1.3
1.1.2
1.1.1
1.1.0
1.0.1
1.0.0
Labels
Clear labels   
bug

   
confirmed

   
discussion

   
duplicate

   
enhancement

   
feature

   
feature-request

   
not-planned

   
pull-request

Mirrored from GitHub Pull Request

  
secondary-feature

   
stale

   
triage

   
waiting-feedback
No labels
bug
confirmed
discussion
duplicate
enhancement
feature
feature-request
not-planned
pull-request
secondary-feature
stale
triage
waiting-feedback
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
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#420
No description provided.