Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
Date: Tue, 10 Jul 2018 05:27:37
Message-Id: 1531200280.ff422337a888f3b2e2bd9a648e18b400abc44733.gyakovlev@gentoo
1 commit: ff422337a888f3b2e2bd9a648e18b400abc44733
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 10 05:24:40 2018 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 10 05:24:40 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff422337
7
8 net-dns/dnscrypt-proxy: adjust systemd service
9
10 Disable socket file by default, as
11 described in pkg_postinst message.
12 Users who want to use socket activation will have to
13 set listen_addresses to an empty set (i.e. [] )
14 and enable dnscrypt-proxy.socket explicitly.
15
16 Package-Manager: Portage-2.3.41, Repoman-2.3.9
17
18 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service | 11 +++++------
19 1 file changed, 5 insertions(+), 6 deletions(-)
20
21 diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
22 index ed02955621b..a0c7a1408c8 100644
23 --- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
24 +++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
25 @@ -7,12 +7,11 @@ Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki
26 ## If you enable this, the `listen_addresses` list in the main configuration file can be empty.
27 ## Or, at least, the addresses it contains should not overlap with the systemd socket addresses.
28
29 -# Requires=dnscrypt-proxy.socket
30 -
31 -After=network.target
32 -Wants=network.target
33 +#Requires=dnscrypt-proxy.socket
34 Before=nss-lookup.target
35 -Wants=nss-lookup.target
36 +After=network.target
37 +Wants=network.target nss-lookup.target
38 +
39
40 [Service]
41 ExecStart=/usr/bin/dnscrypt-proxy --config /etc/dnscrypt-proxy/dnscrypt-proxy.toml
42 @@ -35,5 +34,5 @@ CapabilityBoundingSet=CAP_NET_BIND_SERVICE
43 AmbientCapabilities=CAP_NET_BIND_SERVICE
44
45 [Install]
46 -Also=dnscrypt-proxy.socket
47 +#Also=dnscrypt-proxy.socket
48 WantedBy=multi-user.target