diff options
| author | IT Offshore <developer@it-offshore.co.uk> | 2013-11-10 09:58:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-15 15:23:46 +0000 |
| commit | 73e5eb1a52eb7b0bfe192c3f0d59a58b43fc4731 (patch) | |
| tree | 44bf4cb3bac66c1c1f4cdef437baaef05473e15f /testing/dnscrypt-proxy/dnscrypt-proxy.initd | |
| parent | b6f38e06bc6f83474fd5c74632fe0cbd6d11ece8 (diff) | |
| download | aports-73e5eb1a52eb7b0bfe192c3f0d59a58b43fc4731.tar.bz2 aports-73e5eb1a52eb7b0bfe192c3f0d59a58b43fc4731.tar.xz | |
testing/dnscrypt-proxy: upgrade to to 1.33
Complete patch to bump dnscrypt-proxy to version 1.33
Minor changes to APKBUILD to build with the new sources & make-depends.
confd / initd changed to include the additional configurations to set the alternative
resolver ip / public keys.
Separate patch created to build dnscrypt's dependency libsodium / libsodium-dev
(as it no longer forms part of dnscrypt's sources).
Post-install script is just status / info using the $STRONG / $RED / $GREEN
system colours.
Added /sbin/setup-dnscrypt for changing the resolver dnscrypt queries &
optionally installing unbound for dns caching. This also uses the system terminal
colours. This no longer makes any changes to init.d, it only updates conf.d
Diffstat (limited to 'testing/dnscrypt-proxy/dnscrypt-proxy.initd')
| -rw-r--r-- | testing/dnscrypt-proxy/dnscrypt-proxy.initd | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/testing/dnscrypt-proxy/dnscrypt-proxy.initd b/testing/dnscrypt-proxy/dnscrypt-proxy.initd index ff63b6f418..b09763744c 100644 --- a/testing/dnscrypt-proxy/dnscrypt-proxy.initd +++ b/testing/dnscrypt-proxy/dnscrypt-proxy.initd @@ -1,19 +1,24 @@ #!/sbin/runscript +pidfile=/var/run/dnscrypt-proxy/dnscrypt-proxy.pid +command=/usr/sbin/dnscrypt-proxy +command_args="--pidfile=$pidfile --daemonize + --logfile=${DNSCRYPT_LOGFILE:-/var/log/dnscrypt-proxy/dnscrypt-proxy.log} + --user=${DNSCRYPT_USER:-dnscrypt} + --local-address=${DNSCRYPT_LOCALIP:-127.0.0.1:53}" + + depend() { use net before dns - after logger + after logger firewall } -start() { - ebegin "Starting dnscrypt-proxy" - start-stop-daemon --start --quiet --pidfile=${PID} --exec /usr/sbin/dnscrypt-proxy -- -p ${PID} -l ${DNSCRYPT_LOGFILE} -d -u ${DNSCRYPT_GROUP} -a ${DNSCRYPT_LOCALIP} - eend $? +start_pre() { + checkpath --directory ${pidfile%/*} + # by default opendns is used but its possible to override + if [ -n "$RESOLVER" ] && [ -n "$PUBKEY" ] && [ -n "$PROVIDER" ]; then + command_args="$command_args -r ${RESOLVER} -k ${PUBKEY} -N ${PROVIDER}" + fi } -stop() { - ebegin "Stopping dnscrypt-proxy" - start-stop-daemon --stop --quiet --exec /usr/sbin/dnscrypt-proxy - eend $? -} |