net/dnscrypt-proxy: Set default provider to cisco, add client key support in config

Signed-off-by: Damiano Renfer damiano.renfer@gmail.com
This commit is contained in:
Damiano Renfer 2015-07-22 18:48:18 +02:00
parent 3445505f1d
commit 1163af8bcb
3 changed files with 8 additions and 4 deletions

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnscrypt-proxy PKG_NAME:=dnscrypt-proxy
PKG_VERSION:=1.6.0 PKG_VERSION:=1.6.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://download.dnscrypt.org/dnscrypt-proxy PKG_SOURCE_URL:=http://download.dnscrypt.org/dnscrypt-proxy

View file

@ -1,6 +1,8 @@
config dnscrypt-proxy config dnscrypt-proxy
option address '127.0.0.1' option address '127.0.0.1'
option port '5353' option port '5353'
# option resolver 'opendns' # option resolver 'cisco'
# option resolvers_list '/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv' # option resolvers_list '/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv'
# option ephemeral_keys '1' # option ephemeral_keys '1'
# more details at https://github.com/jedisct1/dnscrypt-proxy#public-key-client-authentication
# option client_key ''

View file

@ -8,14 +8,16 @@ start_instance () {
config_get port "$section" 'port' config_get port "$section" 'port'
config_get resolver "$section" 'resolver' config_get resolver "$section" 'resolver'
config_get resolvers_list "$section" 'resolvers_list' config_get resolvers_list "$section" 'resolvers_list'
config_get client_key "$section" 'client_key'
config_get_bool ephemeral_keys "$section" 'ephemeral_keys' config_get_bool ephemeral_keys "$section" 'ephemeral_keys'
service_start /usr/sbin/dnscrypt-proxy -d \ service_start /usr/sbin/dnscrypt-proxy -d \
-a ${address}:${port} \ -a ${address}:${port} \
-u nobody \ -u nobody \
-L ${resolvers_list:-'/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv'} \ -L ${resolvers_list:-'/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv'} \
-R ${resolver:-'opendns'} \ -R ${resolver:-'cisco'} \
${ephemeral_keys:+'-E'} ${ephemeral_keys:+'-E'} \
${client_key:+'--client-key='$client_key}
} }
start() { start() {