[Astlinux-commits] SF.net SVN: astlinux:[7154] branches/1.0

[<abe...@us...>]

Revision: 7154
          http://sourceforge.net/p/astlinux/code/7154
Author:   abelbeck
Date:     2015-07-26 03:05:07 +0000 (Sun, 26 Jul 2015)
Log Message:
-----------
dnscrypt-proxy, only require DNSCRYPT_2SERVER_ADDRESS to enable secondary proxy server, default to OpenDNS if the rest are empty

Modified Paths:
--------------
    branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init
    branches/1.0/package/dnsmasq/dnsmasq.init
    branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf

Modified: branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init
===================================================================
--- branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init	2015-07-26 02:43:19 UTC (rev 7153)
+++ branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init	2015-07-26 03:05:07 UTC (rev 7154)
@@ -29,10 +29,14 @@
     dnscrypt-proxy -d --local-address 127.0.0.1:2053 -n 520 -m ${DNSCRYPT_VERBOSITY:-5} -p $PIDFILE $ephemeral_keys \
                    --resolver-address "$address" --provider-name "$name" --provider-key "$key"
 
-    if [ -n "$DNSCRYPT_2SERVER_ADDRESS" -a -n "$DNSCRYPT_2PROVIDER_NAME" -a -n "$DNSCRYPT_2PROVIDER_KEY" ]; then
+    if [ -n "$DNSCRYPT_2SERVER_ADDRESS" ]; then
 
+      # Default to OpenDNS
+      name="${DNSCRYPT_2PROVIDER_NAME:-2.dnscrypt-cert.opendns.com}"
+      key="${DNSCRYPT_2PROVIDER_KEY:-B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79}"
+
       dnscrypt-proxy -d --local-address 127.0.0.1:2054 -n 520 -m ${DNSCRYPT_VERBOSITY:-5} -p $PID2FILE $ephemeral_keys \
-             --resolver-address "$DNSCRYPT_2SERVER_ADDRESS" --provider-name "$DNSCRYPT_2PROVIDER_NAME" --provider-key "$DNSCRYPT_2PROVIDER_KEY"
+                     --resolver-address "$DNSCRYPT_2SERVER_ADDRESS" --provider-name "$name" --provider-key "$key"
     fi
   fi
 }

Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init	2015-07-26 02:43:19 UTC (rev 7153)
+++ branches/1.0/package/dnsmasq/dnsmasq.init	2015-07-26 03:05:07 UTC (rev 7154)
@@ -46,7 +46,7 @@
   if [ -f /etc/init.d/dnscrypt ]; then
     if [ "$DNSCRYPT_PROXY" = "yes" ]; then
       servers="127.0.0.1#2053"
-      if [ -n "$DNSCRYPT_2SERVER_ADDRESS" -a -n "$DNSCRYPT_2PROVIDER_NAME" -a -n "$DNSCRYPT_2PROVIDER_KEY" ]; then
+      if [ -n "$DNSCRYPT_2SERVER_ADDRESS" ]; then
         servers="$servers 127.0.0.1#2054"
       fi
     fi

Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2015-07-26 02:43:19 UTC (rev 7153)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2015-07-26 03:05:07 UTC (rev 7154)
@@ -375,7 +375,8 @@
 #DNSCRYPT_SERVER_ADDRESS=""
 #DNSCRYPT_PROVIDER_NAME=""
 #DNSCRYPT_PROVIDER_KEY=""
-## Optional - Secondary Proxy Server, all three variables below must be defined to be enabled.
+## Optional - Secondary Proxy Server, DNSCRYPT_2SERVER_ADDRESS must be defined to be enabled.
+## Other empty DNSCRYPT_2PROVIDER_NAME/KEY fields use the OpenDNS defaults.
 #DNSCRYPT_2SERVER_ADDRESS=""
 #DNSCRYPT_2PROVIDER_NAME=""
 #DNSCRYPT_2PROVIDER_KEY=""

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.