From b7c61914b2532fbef865b78a95e065c2a50b9795 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 13 Dec 2021 15:22:51 -0500 Subject: [PATCH] dnscrypt-proxy: put config in subdirectory of etc/. this change prevents dnscrypt-proxy from polluting etc/ with lists of relays, resolvers, etc. --- srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run | 2 +- srcpkgs/dnscrypt-proxy/template | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run index 6e240fb488e2..3f0cd6172435 100755 --- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run +++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run @@ -1,3 +1,3 @@ #!/bin/sh exec 2>&1 -exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml +exec dnscrypt-proxy -config /etc/dnscrypt-proxy/dnscrypt-proxy.toml diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template index 6b1ee815c75b..0869755308f8 100644 --- a/srcpkgs/dnscrypt-proxy/template +++ b/srcpkgs/dnscrypt-proxy/template @@ -1,7 +1,7 @@ # Template file for 'dnscrypt-proxy' pkgname=dnscrypt-proxy version=2.1.1 -revision=1 +revision=2 build_style=go go_import_path=github.com/dnscrypt/dnscrypt-proxy go_package="${go_import_path}/dnscrypt-proxy" @@ -12,12 +12,13 @@ homepage="https://github.com/DNSCrypt/dnscrypt-proxy" changelog="https://raw.githubusercontent.com/DNSCrypt/dnscrypt-proxy/master/ChangeLog" distfiles="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${version}.tar.gz" checksum=cc4a2f274ce48c3731ff981e940e6475d912fb356a80481e91725e81d67bde14 -conf_files="/etc/dnscrypt-proxy.toml" +conf_files="/etc/dnscrypt-proxy/dnscrypt-proxy.toml" system_accounts="dnscrypt_proxy" make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy" post_install() { - vconf dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy.toml + vmkdir etc/dnscrypt-proxy + vcopy dnscrypt-proxy/example-dnscrypt-proxy.toml etc/dnscrypt-proxy/dnscrypt-proxy.toml vlicense LICENSE vsv dnscrypt-proxy }