From: TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] dnscrypt-proxy: put config in subdirectory of etc/.
Date: Mon, 13 Dec 2021 21:36:55 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34517@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1673 bytes --]
There is a new pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages dnscrypt
https://github.com/void-linux/void-packages/pull/34517
dnscrypt-proxy: put config in subdirectory of etc/.
this change prevents dnscrypt-proxy from polluting etc/ with lists of relays, resolvers, etc.
After enabling the service, I was seeing these files show up in etc/:
```
public-resolvers.md
public-resolvers.md.minisig
relays.md
relays.md.minisig
```
Not sure how it should notify that the config location has moved. Should there be an `INSTALL.msg`, or should the config be moved in post in an `INSTALL`?
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34517.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dnscrypt-34517.patch --]
[-- Type: text/x-diff, Size: 2102 bytes --]
From b7c61914b2532fbef865b78a95e065c2a50b9795 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
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
}
next reply other threads:[~2021-12-13 20:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-13 20:36 TinfoilSubmarine [this message]
2022-01-02 18:47 ` cinerea0
2022-01-13 18:22 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-01-13 18:25 ` TinfoilSubmarine
2022-03-24 23:37 ` TinfoilSubmarine
2022-03-28 21:05 ` daniel-eys
2022-07-18 2:13 ` github-actions
2022-08-01 2:14 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34517@inbox.vuxu.org \
--to=tinfoilsubmarine@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).