Removed adhoc config

4 files changed, 11 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16317f24e995..472335d16a65 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dingo-git
 	pkgdesc = A DNS client in Go that supports Google DNS over HTTPS
-	pkgver = 0.13.r2.g42078d5
+	pkgver = 0.13.r4.gf79f3dd
 	pkgrel = 2
 	url = https://github.com/pforemski/dingo
 	arch = i686
@@ -10,13 +10,10 @@ pkgbase = dingo-git
 	makedepends = git
 	provides = dingo
 	conflicts = dingo
-	backup = etc/dingo
 	source = git+https://github.com/pforemski/dingo.git#branch=master
-	source = dingo.config
 	source = dingo.service
 	sha256sums = SKIP
-	sha256sums = b550726b87687f0dc659d0d3eb2eb1e2448d0bf556743992d853de572675fefd
-	sha256sums = c84e727bb76af4c7a8d88014de5992e6a6bf056aa5be4654d96b1229df55984c
+	sha256sums = 4ba90fdb9ab77f50fc50012f42187fd570921f3f6b868b32619955e910c5cdd5
 
 pkgname = dingo-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 08a84131c1df..babaacc82fbf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=dingo
 pkgname=${_pkgname}-git
-pkgver=0.13.r2.g42078d5
+pkgver=0.13.r4.gf79f3dd
 pkgrel=2
 pkgdesc='A DNS client in Go that supports Google DNS over HTTPS'
 provides=('dingo')
@@ -13,13 +13,9 @@ makedepends=('go' 'git')
 url='https://github.com/pforemski/dingo'
 _gopkg=github.com/pforemski
 source=("git+https://${_gopkg}/${_pkgname}.git#branch=master"
-       dingo.config
        dingo.service)
 sha256sums=('SKIP'
-            'b550726b87687f0dc659d0d3eb2eb1e2448d0bf556743992d853de572675fefd'
-            'c84e727bb76af4c7a8d88014de5992e6a6bf056aa5be4654d96b1229df55984c')
-
-backup=('etc/dingo')
+            '4ba90fdb9ab77f50fc50012f42187fd570921f3f6b868b32619955e910c5cdd5')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -33,7 +29,8 @@ build() {
   ln -s "${srcdir}/${_pkgname}" "$srcdir/go/src/${_gopkg}/"
   cd "${srcdir}/go/src/${_gopkg}/${_pkgname}"
   GOPATH="${srcdir}/go" go get -v \
-		-gcflags "-trimpath $GOPATH/src" \
+        -ldflags="-s -w" \
+        -gcflags "-trimpath $GOPATH/src" \
 		./...
 }
 
@@ -42,7 +39,6 @@ package() {
   install -Dm755 dingo "${pkgdir}/usr/bin/dingo"
 
   cd "${srcdir}"
-  install -Dm644 dingo.config "${pkgdir}/etc/dingo"
   install -Dm644 dingo.service "${pkgdir}/usr/lib/systemd/system/dingo.service"
 }
 
diff --git a/dingo.config b/dingo.config
deleted file mode 100644
index b7040fb6f915..000000000000
--- a/dingo.config
+++ /dev/null
@@ -1,35 +0,0 @@
-# Usage of dingo-linux-amd64:
-#   -bind string
-#     	IP address to bind to (default "127.0.0.1")
-#   -dbg int
-#     	debugging level (default 2)
-#   -gdns:auto
-#     	Google DNS: try to lookup the closest IPv4 server
-#   -gdns:edns string
-#     	Google DNS: EDNS client subnet (set 0.0.0.0/0 to disable)
-#   -gdns:host string
-#     	Google DNS: HTTP 'Host' header (real FQDN, encrypted in TLS) (default "dns.google.com")
-#   -gdns:nopad
-#     	Google DNS: disable random padding
-#   -gdns:server string
-#     	Google DNS: server address (default "216.58.195.78")
-#   -gdns:sni string
-#     	Google DNS: SNI string to send (should match server certificate) (default "www.google.com")
-#   -gdns:workers int
-#     	Google DNS: number of independent workers (default 10)
-#   -h1
-#     	use HTTPS/1.1 transport
-#   -odns:host string
-#     	OpenDNS: HTTP 'Host' header (real FQDN, encrypted in TLS) (default "api.openresolve.com")
-#   -odns:server string
-#     	OpenDNS: web server address (default "67.215.70.81")
-#   -odns:sni string
-#     	OpenDNS: TLS SNI string to send (unencrypted, must validate as server cert) (default "www.openresolve.com")
-#   -odns:workers int
-#     	OpenDNS: number of independent workers
-#   -port int
-#     	listen on port number (default 32000)
-ARGS=\
-    -port=53 \
-    -gdns:auto
-
diff --git a/dingo.service b/dingo.service
index feb812cbe25d..689d572b97ab 100644
--- a/dingo.service
+++ b/dingo.service
@@ -1,11 +1,12 @@
 [Unit]
-Description=dingo
+Description=Dingo Secure DNS resolver
 Wants=network.target
-Before=network.target
 
 [Service]
-EnvironmentFile=/etc/dingo
-ExecStart=/usr/bin/dingo $ARGS
+Type=simple
+User=nobody
+ExecStart=/usr/bin/dingo
 
 [Install]
 WantedBy=multi-user.target
+