From 09f472dc8960d3c9e02ce870eae45fa5edded11f Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Wed, 31 Oct 2018 01:40:33 -0700
Subject: Fixed service starting | Cleaned up args

---
 PKGBUILD               | 8 ++++----
 dnscrypt-wrapper.confd | 6 +++---
 dnscrypt-wrapper.initd | 5 ++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 97933d2..8b8ccdc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Artix lacks this init script entirely
 
 pkgname=dnscrypt-wrapper-openrc
-pkgver=20181030
-pkgrel=2
+pkgver=20181031
+pkgrel=1
 pkgdesc="OpenRC dnscrypt-wrapper init script"
 arch=('any')
 url="https://neueland.iserlohn-fortress.net/gitea/jc_gargma"
@@ -16,8 +16,8 @@ backup=('etc/init.d/dnscrypt-wrapper'
         'etc/conf.d/dnscrypt-wrapper')
 source=("dnscrypt-wrapper.initd"
         "dnscrypt-wrapper.confd")
-sha256sums=('71aeea48c89cd89e3c698b0eb4b3db169477bb5a55ea6e84f874893b56b9e73f'
-            '6e73075a10c3ea920fc61c6dd34bbf43167165afaab19cf63e04fdd74318c111')
+sha256sums=('cc1110746af10c4ec408f88c226de380cd022e2a8e8b7fec68092361b51c10fb'
+            'dc145eae810c3ba103e399b9b294f7c7cb832482fbf62b7e5783aeb5c7f9ec57')
 
 pkgver() {
     date +%Y%m%d
diff --git a/dnscrypt-wrapper.confd b/dnscrypt-wrapper.confd
index cbdb8c2..9a8e65b 100644
--- a/dnscrypt-wrapper.confd
+++ b/dnscrypt-wrapper.confd
@@ -1,3 +1,3 @@
-DNSCRYPT_WRAPPER_RUNTIME_OPTS="--user=dnscrypt-wrapper"
-DNSCRYPT_WRAPPER_KEY_OPTS="--provider-publickey-file=/etc/dnscrypt-wrapper/public.key --provider-secretkey-file=/etc/dnscrypt-wrapper/private.key --crypt-secretkey-file=/etc/dnscrypt-wrapper/1.key --provider-cert-file=/etc/dnscrypt-wrapper/1.cert --provider-name=2.dnscrypt-cert.yourservernamehere"
-DNSCRYPT_WRAPPER_NETWORK_OPTS="--listen-address=192.168.10.1:443 --resolver-address=127.0.0.1:5353"
+DNSCRYPT_WRAPPER_RUNTIME_ARGS="--user=dnscrypt-wrapper"
+DNSCRYPT_WRAPPER_KEY_ARGS="--provider-publickey-file=/etc/dnscrypt-wrapper/public.key --provider-secretkey-file=/etc/dnscrypt-wrapper/private.key --crypt-secretkey-file=/etc/dnscrypt-wrapper/1.key --provider-cert-file=/etc/dnscrypt-wrapper/1.cert --provider-name=2.dnscrypt-cert.yourservernamehere"
+DNSCRYPT_WRAPPER_NETWORK_ARGS="--listen-address=192.168.10.1:443 --resolver-address=127.0.0.1:5353"
diff --git a/dnscrypt-wrapper.initd b/dnscrypt-wrapper.initd
index b214e55..0a7b6aa 100755
--- a/dnscrypt-wrapper.initd
+++ b/dnscrypt-wrapper.initd
@@ -1,13 +1,12 @@
 #!/usr/bin/openrc-run
 
 command="/usr/bin/dnscrypt-wrapper"
-command_args="${DNSCRYPT_WRAPPER_RUNTIME_OPTS} ${DNSCRYPT_WRAPPER_KEY_OPTS} ${DNSCRYPT_WRAPPER_NETWORK_OPTS}"
+command_args="${DNSCRYPT_WRAPPER_RUNTIME_ARGS} ${DNSCRYPT_WRAPPER_KEY_ARGS} ${DNSCRYPT_WRAPPER_NETWORK_ARGS}"
 pidfile="/run/${RC_SVCNAME}.pid"
 start_stop_daemon_args="--background --make-pidfile"
 
 depend() {
-        use logger net
-        provide dns
+        need dnsmasq
 }
 
 stop_pre() {
-- 
cgit v1.2.1