diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2018-04-11 13:06:54 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2018-04-11 13:06:54 +0000 |
| commit | 2b6cf8bdb121296a7bef7c7d05e458ce16b1401f (patch) | |
| tree | 6b34374ed2aba931deec17debddf2ceaa5c41525 | |
| parent | 9bcc3109caf436c3dbcf5eadd61f8a68b6308961 (diff) | |
| download | aports-2b6cf8bdb121296a7bef7c7d05e458ce16b1401f.tar.bz2 aports-2b6cf8bdb121296a7bef7c7d05e458ce16b1401f.tar.xz | |
community/dnscrypt-proxy: fixed initd for new version
| -rw-r--r-- | community/dnscrypt-proxy/APKBUILD | 14 | ||||
| -rw-r--r-- | community/dnscrypt-proxy/dnscrypt-proxy.confd | 11 | ||||
| -rw-r--r-- | community/dnscrypt-proxy/dnscrypt-proxy.initd | 27 |
3 files changed, 21 insertions, 31 deletions
diff --git a/community/dnscrypt-proxy/APKBUILD b/community/dnscrypt-proxy/APKBUILD index 6382d5efe5..7f375af854 100644 --- a/community/dnscrypt-proxy/APKBUILD +++ b/community/dnscrypt-proxy/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=dnscrypt-proxy pkgver=2.0.9b2 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for securing communications between a client and a DNS resolver" -url="https://dnscrypt.org/" +url="https://dnscrypt.info" arch="all" license="custom" makedepends="$depends_dev libsodium-dev ldns-dev go" @@ -44,11 +44,11 @@ package() { install -vDm 644 "example-${pkgname}.toml" \ "${pkgdir}/etc/${pkgname}/${pkgname}.toml" install -vDm 644 "example-blacklist.txt" \ - "${pkgdir}/etc/${pkgname}/blacklist.txt" + "${pkgdir}/etc/${pkgname}/example-blacklist.txt" install -vDm 644 "example-cloaking-rules.txt" \ - "${pkgdir}/etc/${pkgname}/cloaking-rules.txt" + "${pkgdir}/etc/${pkgname}/example-cloaking-rules.txt" install -vDm 644 "example-forwarding-rules.txt" \ - "${pkgdir}/etc/${pkgname}/forwarding-rules.txt" + "${pkgdir}/etc/${pkgname}/example-forwarding-rules.txt" install -vDm 644 "example-whitelist.txt" \ "${pkgdir}/etc/${pkgname}/example-whitelist.txt" chown dnscrypt "$pkgdir"/var/log/$pkgname @@ -67,6 +67,6 @@ setup() { } sha512sums="d64cc8e0b61e1e548b63531dc4c733af1605ccda89a9f905227e97cb966a3488104ac9af229521909ca88bde283dce224e712326b4d1717af70be2d04821c6c2 dnscrypt-proxy-2.0.9b2.tar.gz -f80af8014e7bb2e97752f338db6c85a8ba69938448d7e2470659112f1f60890e232f835ce4250f49f90b0a3301f82065a2ab6d8e0ea77c777bc99ef1e1e9825a dnscrypt-proxy.initd -8cd2d40c1f465a3b26aa934fe2103650beba9504676faca3ccc9ee2b5bad940e561b3dd201d84c380bfdada72cacbe4862fc1315a4bd44fd7c56ef4f19a884f9 dnscrypt-proxy.confd +c38095ee38054fb0d3b51c002b5038cb073b8b9ec0ababf975e70d27e4c1bd90c0c3f846863e052f30ff2ac6d4ce84c5d4192ebae0eebfa013eb08edf840f8bf dnscrypt-proxy.initd +44a2d792aa80a048ea6bdb4a79c1e436bcad3610a28a963ebed5c0e77a8b2a733c45311a66268fc4026d1c4c9b1f222813aeeea9c619832bbcb7c227542b65a8 dnscrypt-proxy.confd 66dd43d84117a0151ae41f34d82b716760382a5a491424bf6418228ffd21f0dfbc88e34cc5074e11f97f006335d97b85367bb9ab1d96747a48e893c022ad52d0 dnscrypt-proxy.setup" diff --git a/community/dnscrypt-proxy/dnscrypt-proxy.confd b/community/dnscrypt-proxy/dnscrypt-proxy.confd index 9539c66426..070ba95d9a 100644 --- a/community/dnscrypt-proxy/dnscrypt-proxy.confd +++ b/community/dnscrypt-proxy/dnscrypt-proxy.confd @@ -1,9 +1,4 @@ -# DNSCRYPT_LOGFILE=/var/log/dnscrypt-proxy/dnscrypt-proxy.log +#DNSCRYPT_OPTS="--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml" +#DNSCRYPT_USER="dnscrypt" +#DNSCRYPT_GROUP="dnscrypt" -# override listen address where DNSCRYPT listen -# DNSCRYPT_LOCALIP=127.0.0.1:53 - -# override the default OpenDNS Resolver here -RESOLVER=208.67.220.220:443; -PROVIDER=2.dnscrypt-cert.opendns.com -PUBKEY=B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79; diff --git a/community/dnscrypt-proxy/dnscrypt-proxy.initd b/community/dnscrypt-proxy/dnscrypt-proxy.initd index f68da6da72..e24085f127 100644 --- a/community/dnscrypt-proxy/dnscrypt-proxy.initd +++ b/community/dnscrypt-proxy/dnscrypt-proxy.initd @@ -1,24 +1,19 @@ #!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 -pidfile=/var/run/dnscrypt-proxy/dnscrypt-proxy.pid -command=/usr/bin/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}" - +command="/usr/bin/dnscrypt-proxy" +command_args="${DNSCRYPT_OPTS:---config /etc/dnscrypt-proxy/dnscrypt-proxy.toml}" +command_user="${DNSCRYPT_USER:-dnscrypt}:${DNSCRYPT_GROUP:-dnscrypt}" +pidfile="/run/dnscrypt-proxy/${SVCNAME}.pid" +start_stop_daemon_args="--background --make-pidfile" depend() { - use net - before dns - after logger firewall + use net logger + provide dns } 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 + checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${SVCNAME}" + checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${SVCNAME}" } - |