Remove dnscrypt-proxy-resolvconf.service

This commit is contained in:
VictorR2007 2017-03-16 19:56:42 +03:00
parent 588c6e1b78
commit 2b5cbe9e6e
2 changed files with 9 additions and 32 deletions

View file

@ -1,20 +0,0 @@
[Unit]
Description=DNSCrypt proxy resolvconf support
Documentation=man:dnscrypt-proxy(8)
After=dnscrypt-proxy.socket
Requires=dnscrypt-proxy.socket
ConditionFileIsExecutable=/sbin/resolvconf
[Service]
Type=oneshot
RemainAfterExit=true
Environment="DNSCRYPT_PROXY_LOCAL_ADDRESS=127.0.2.1:53"
EnvironmentFile=-/etc/default/dnscrypt-proxy
ExecStart=/bin/sh -c 'echo "nameserver ${DNSCRYPT_PROXY_LOCAL_ADDRESS}" \
| cut -d ":" -f 1 \
| /sbin/resolvconf -a lo.dnscrypt-proxy'
ExecStop=/sbin/resolvconf -d lo.dnscrypt-proxy
[Install]
WantedBy=multi-user.target
Also=dnscrypt-proxy.socket

View file

@ -1,15 +1,14 @@
Summary: Tool for securing communications between a client and a DNS resolver
Name: dnscrypt-proxy
Version: 1.9.4
Release: 2
Release: 3
License: BSD
Group: Networking/Other
Url: http://dnscrypt.org
Source0: http://download.dnscrypt.org/dnscrypt-proxy/%{name}-%{version}.tar.bz2
Source1: %{name}-resolvconf.service
Source2: %{name}.service
Source3: %{name}.socket
Source4: %{name}-default
Source1: %{name}.service
Source2: %{name}.socket
Source3: %{name}-default
BuildRequires: pkgconfig(libsodium)
BuildRequires: pkgconfig(systemd)
BuildRequires: gawk
@ -32,13 +31,13 @@ A tool for securing communications between a client and a DNS resolver.
%install
%makeinstall
install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_systemunitdir}/%{name}-resolvconf.service
install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_systemunitdir}/%{name}.service
install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_systemunitdir}/%{name}.socket
install -D -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/default/%{name}
install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_systemunitdir}/%{name}.service
install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_systemunitdir}/%{name}.socket
install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/default/%{name}
sed 's|# LocalAddress 127.0.0.1:53|LocalAddress 127.0.2.1:53|' -i %{buildroot}%{_sysconfdir}/dnscrypt-proxy.conf
%files
%{_systemunitdir}/%{name}-resolvconf.service
%{_systemunitdir}/%{name}.service
%{_systemunitdir}/%{name}.socket
%{_sysconfdir}/default/%{name}
@ -79,5 +78,3 @@ Development libraries from %{name}.
%files devel
%{_includedir}/dnscrypt/*.h