Changed resolv.conf handling format to make it compatible with alpine linux (#658)

Author: mageddo

RELEASE-NOTES.md

@@ -1,9 +1,12 @@
-## 5.0.5
+## 5.1.0
+* Changed resolv.conf handling format to make it compatible with alpine linux see [#627][5_1_0_1][1].
 * Refactoring Linux amd64 static build to work on Github Actions
 * Creating the docs for config v3
 * Fixing Hostname Entry Update API
 * Fixing intermittent unit test
 
+[5_1_0_1]: https://github.com/mageddo/dns-proxy-server/issues/627
+
 ## 5.0.0
 * Refactoring config module to support config v3
 * Activating Config v3 for beta testing

gradle.properties

@@ -1 +1 @@
-version=5.0.5-snapshot
+version=5.1.0-snapshot

src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorDefault.java

@@ -37,7 +37,7 @@ public void configure(IpAddr addr) {
         final var serversBefore = this.findNetworkDnsServers(network);
         this.serversBefore.put(network, serversBefore);
         final var success = this.updateDnsServers(network,
-            Collections.singletonList(addr.getRawIP())
+            Collections.singletonList(addr.getIpAsText())
         );
         log.debug("status=configuring, network={}, serversBefore={}, success={}", network,
             this.serversBefore, success

src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinux.java

@@ -58,7 +58,7 @@ public void configure(IpAddr addr) {
 
     if (confFile.isResolvconf()) {
       final var overrideNameServers = this.isOverrideNameServersActive();
-      ResolvconfConfigurator.process(confFile.getPath(), addr, overrideNameServers);
+      ResolvconfConfiguratorV2.process(confFile.getPath(), addr, overrideNameServers);
     } else if (confFile.isResolved()) {
       this.configureResolved(addr, confFile);
     } else {
@@ -82,7 +82,7 @@ public void restore() {
 
     final var confFile = this.getConfFile();
     if (confFile.isResolvconf()) {
-      ResolvconfConfigurator.restore(confFile.getPath());
+      ResolvconfConfiguratorV2.restore(confFile.getPath());
     } else if (confFile.isResolved()) {
       ResolvedConfigurator.restore(confFile.getPath());
       tryRestartResolved();

src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxResolverConfDetector.java

@@ -8,6 +8,7 @@
 import com.mageddo.dnsproxyserver.dnsconfigurator.linux.ResolvFile.Type;
 
 public class LinuxResolverConfDetector {
+
   public static Type detect(Path path) {
 
     if (isSystemdResolved(path)) {

src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfigurator.java

@@ -8,6 +8,10 @@
 import com.mageddo.dnsproxyserver.utils.Dns;
 import com.mageddo.net.IpAddr;
 
+/**
+ * @deprecated deprecated because of #627, use {@link ResolvconfConfiguratorV2}
+ */
+@Deprecated
 public class ResolvconfConfigurator {
 
   public static void process(Path confFile, IpAddr addr) {