diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | dnsproxy-adguard | 10 | ||||
| -rw-r--r-- | dnsproxy-adguard.service | 3 | ||||
| -rw-r--r-- | dnsproxy-adguard@.service | 12 |
5 files changed, 23 insertions, 22 deletions
@@ -1,17 +1,18 @@ pkgbase = dnsproxy-adguard pkgdesc = Simple DNS proxy with DoH, DoT, and DNSCrypt support by AdguardTeam pkgver = 0.29.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/AdguardTeam/dnsproxy arch = x86_64 license = Apache makedepends = go makedepends = git + backup = etc/conf.d/dnsproxy-adguard source = dnsproxy-adguard.service - source = dnsproxy-adguard@.service + source = dnsproxy-adguard source = https://github.com/AdguardTeam/dnsproxy/archive/v0.29.0.tar.gz - sha256sums = e10bee304ce60088e523b0925c85a7c0640eaf4b2a686d301de565290e70560a - sha256sums = 0e4083e1fa627a07e0ca92195c8a5181020ca567b9ffd8cd4f6c9e6a7fe35fa4 + sha256sums = 7a6c7a49bae6865e23db6ea0bb438a5588769cae742936bfd4c6d7b0a0c6b424 + sha256sums = de2afa0883f2829a1f7487899ddc9e711913686aea1ce186a60aad022604df4b sha256sums = c091e04d71abdf1f9abe88b98e0ef66ddee9ff44c38f1b70a7be592d2a563ac3 pkgname = dnsproxy-adguard @@ -3,17 +3,18 @@ _projectname=dnsproxy pkgname=dnsproxy-adguard pkgver=0.29.0 -pkgrel=1 +pkgrel=2 pkgdesc="Simple DNS proxy with DoH, DoT, and DNSCrypt support by AdguardTeam" arch=('x86_64') url="https://github.com/AdguardTeam/dnsproxy" license=('Apache') source=("dnsproxy-adguard.service" - "dnsproxy-adguard@.service" + "dnsproxy-adguard" "https://github.com/AdguardTeam/dnsproxy/archive/v${pkgver}.tar.gz") makedepends=("go" "git") -sha256sums=('e10bee304ce60088e523b0925c85a7c0640eaf4b2a686d301de565290e70560a' - '0e4083e1fa627a07e0ca92195c8a5181020ca567b9ffd8cd4f6c9e6a7fe35fa4' +backup=(etc/conf.d/dnsproxy-adguard) +sha256sums=('7a6c7a49bae6865e23db6ea0bb438a5588769cae742936bfd4c6d7b0a0c6b424' + 'de2afa0883f2829a1f7487899ddc9e711913686aea1ce186a60aad022604df4b' 'c091e04d71abdf1f9abe88b98e0ef66ddee9ff44c38f1b70a7be592d2a563ac3') build(){ @@ -25,5 +26,5 @@ package() { cd "${srcdir}/${_projectname}-${pkgver}" install -Dm755 dnsproxy "${pkgdir}/usr/bin/${pkgname}" install -Dm644 "${srcdir}/dnsproxy-adguard.service" "${pkgdir}/usr/lib/systemd/system/dnsproxy-adguard.service" - install -Dm644 "${srcdir}/dnsproxy-adguard@.service" "${pkgdir}/usr/lib/systemd/system/dnsproxy-adguard@.service" + install -Dm644 "${srcdir}/dnsproxy-adguard" "${pkgdir}/etc/conf.d/dnsproxy-adguard" } diff --git a/dnsproxy-adguard b/dnsproxy-adguard new file mode 100644 index 000000000000..12f39abf71f8 --- /dev/null +++ b/dnsproxy-adguard @@ -0,0 +1,10 @@ +#parmas of dnsproxy-adguard +ADDRESS="127.0.0.1" +PORT="5353" +UPSTREAMS="-u tls://8.8.8.8 \ + -u tls://8.8.4.4 \ + -u https://mozilla.cloudflare-dns.com/dns-query \ + -u https://dns.adguard.com/dns-query \ + -u tls://9.9.9.9 \ + -u tls://dns.adguard.com" +OTHER_PARAMS="--cache --all-servers" diff --git a/dnsproxy-adguard.service b/dnsproxy-adguard.service index 2275aef85079..5794a42a58f5 100644 --- a/dnsproxy-adguard.service +++ b/dnsproxy-adguard.service @@ -6,7 +6,8 @@ After=network.target Type=simple User=nobody Group=nobody -ExecStart=/usr/bin/dnsproxy-adguard -l 127.0.0.1 -p 5353 -u tls://8.8.8.8 -u tls://8.8.4.4 -u https://mozilla.cloudflare-dns.com/dns-query -u https://dns.adguard.com/dns-query -u tls://9.9.9.9 -u tls://dns.adguard.com --cache --all-servers +EnvironmentFile=/etc/conf.d/dnsproxy-adguard +ExecStart=/usr/bin/dnsproxy-adguard -l $ADDRESS -p $PORT $UPSTREAMS $OTHER_PARAMS [Install] WantedBy=default.target diff --git a/dnsproxy-adguard@.service b/dnsproxy-adguard@.service deleted file mode 100644 index e0e67e7c6bf2..000000000000 --- a/dnsproxy-adguard@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Simple DNS proxy with DoH, DoT, and DNSCrypt support by AdguardTeam -After=network.target - -[Service] -Type=simple -User=nobody -Group=nobody -ExecStart=/usr/bin/dnsproxy-adguard -l 127.0.0.1 -p %i -u tls://8.8.8.8 -u tls://8.8.4.4 -u https://mozilla.cloudflare-dns.com/dns-query -u https://dns.adguard.com/dns-query -u tls://9.9.9.9 -u tls://dns.adguard.com --cache --all-servers - -[Install] -WantedBy=default.target |