Move StartLimitIntervalSec=0 from [Service] to [Unit]

This solves the warning message: > systemd[1]: /usr/lib/systemd/system/doh-client.service:16: Unknown key 'StartLimitIntervalSec' in section [Service], ignoring.
Merge pull request #173 from vinnyperella/patch-1
2026-03-31 09:45:38 +00:00 · 2025-05-24 12:45:26 +00:00 · 2025-05-18 00:10:28 +00:00 · 2025-05-14 19:26:12 +00:00 · 2025-05-13 01:50:24 +00:00 · 2025-05-09 00:12:11 +00:00
9 changed files with 79 additions and 36 deletions
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -10,18 +10,18 @@ jobs:
    - name: Set up Go
      uses: actions/setup-go@v2
      with:
-        go-version: 1.21
+        go-version: 1.24.3
      id: go

    - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4

    - name: Linux build
      run: |
        make

    - name: Upload Linux build
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
      with:
        name: linux-amd64
        path: |
@@ -29,7 +29,7 @@ jobs:
          doh-server/doh-server

    - name: Cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
      with:
        # A directory to store and save the cache
        path: ~/go/pkg/mod
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -0,0 +1,36 @@
+---
+issues:
+  fix: true
+linters:
+  enable-all: true
+  disable:
+    - importas
+    - depguard
+    - lll
+    - exhaustruct
+    - perfsprint
+    - gochecknoinits
+    - wsl
+    - exportloopref
+linters-settings:
+  revive:
+    enable-all-rules: true
+    rules:
+      - name: line-length-limit
+        disabled: true
+  gocritic:
+    enabled-tags:
+      - diagnostic
+      - style
+      - performance
+      - experimental
+      - opinionated
+  govet:
+    enable-all: true
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/m13253/dns-over-https/v2)
+  gofumpt:
+    extra-rules: true
--- a/Readme.md
+++ b/Readme.md
@@ -58,7 +58,7 @@ sudo make uninstall
 ```bash
 docker run -d --name doh-server \
  -p 8053:8053 \
-  -e UPSTREAM_DNS_SERVER="udp:8.8.8.8:53" \
+  -e UPSTREAM_DNS_SERVER="udp:208.67.222.222:53,udp:208.67.220.220:53" \
  -e DOH_HTTP_PREFIX="/dns-query" \
  -e DOH_SERVER_LISTEN=":8053" \
  -e DOH_SERVER_TIMEOUT="10" \
@@ -66,6 +66,7 @@ docker run -d --name doh-server \
  -e DOH_SERVER_VERBOSE="false" \
  satishweb/doh-server
 ```
+Note: Multiple Upstream DNS server support was added in the container image on 2024-12-19.

 Feeling adventurous? Try the latest build:

--- a/doh-client/version.go
+++ b/doh-client/version.go
@@ -24,6 +24,6 @@
 package main

 const (
-	VERSION    = "2.3.7"
+	VERSION    = "2.3.10"
 	USER_AGENT = "DNS-over-HTTPS/" + VERSION + " (+https://github.com/m13253/dns-over-https)"
 )
--- a/doh-server/version.go
+++ b/doh-server/version.go
@@ -24,6 +24,6 @@
 package main

 const (
-	VERSION    = "2.3.7"
+	VERSION    = "2.3.10"
 	USER_AGENT = "DNS-over-HTTPS/" + VERSION + " (+https://github.com/m13253/dns-over-https)"
 )
--- a/go.mod
+++ b/go.mod
@@ -1,22 +1,20 @@
 module github.com/m13253/dns-over-https/v2

-go 1.22.0
-
-toolchain go1.23.2
+go 1.24

 require (
-	github.com/BurntSushi/toml v1.4.0
+	github.com/BurntSushi/toml v1.5.0
 	github.com/gorilla/handlers v1.5.2
 	github.com/infobloxopen/go-trees v0.0.0-20221216143356-66ceba885ebc
-	github.com/miekg/dns v1.1.62
-	golang.org/x/net v0.31.0
+	github.com/miekg/dns v1.1.66
+	golang.org/x/net v0.40.0
 )

 require (
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/sync v0.9.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
-	golang.org/x/text v0.20.0 // indirect
-	golang.org/x/tools v0.27.0 // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/tools v0.33.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,26 +1,28 @@
-github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
-github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
+github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE=
 github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w=
 github.com/infobloxopen/go-trees v0.0.0-20221216143356-66ceba885ebc h1:RhT2pjLo3EVRmldbEcBdeRA7CGPWsNEJC+Y/N1aXQbg=
 github.com/infobloxopen/go-trees v0.0.0-20221216143356-66ceba885ebc/go.mod h1:BaIJzjD2ZnHmx2acPF6XfGLPzNCMiBbMRqJr+8/8uRI=
-github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
-github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
+github.com/miekg/dns v1.1.66 h1:FeZXOS3VCVsKnEAd+wBkjMC3D2K+ww66Cq3VnCINuJE=
+github.com/miekg/dns v1.1.66/go.mod h1:jGFzBsSNbJw6z1HYut1RKBKHA9PBdxeHrZG8J+gC2WE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
-golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
-golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o=
-golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
+golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
+golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
+golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
+golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
--- a/systemd/doh-client.service
+++ b/systemd/doh-client.service
@@ -4,13 +4,16 @@ Documentation=https://github.com/m13253/dns-over-https
 After=network.target
 Before=nss-lookup.target
 Wants=nss-lookup.target
+StartLimitIntervalSec=0

 [Service]
 AmbientCapabilities=CAP_NET_BIND_SERVICE
 ExecStart=/usr/local/bin/doh-client -conf /etc/dns-over-https/doh-client.conf
 LimitNOFILE=1048576
 Restart=always
-RestartSec=3
+RestartSec=1s
+RestartMaxDelaySec=76s
+RestartSteps=9
 Type=simple
 DynamicUser=yes

--- a/systemd/doh-server.service
+++ b/systemd/doh-server.service
@@ -2,13 +2,16 @@
 Description=DNS-over-HTTPS Server
 Documentation=https://github.com/m13253/dns-over-https
 After=network.target
+StartLimitIntervalSec=0

 [Service]
 AmbientCapabilities=CAP_NET_BIND_SERVICE
 ExecStart=/usr/local/bin/doh-server -conf /etc/dns-over-https/doh-server.conf
 LimitNOFILE=1048576
 Restart=always
-RestartSec=3
+RestartSec=1s
+RestartMaxDelaySec=76s
+RestartSteps=9
 Type=simple
 DynamicUser=yes
Author	SHA1	Message	Date
Star Brilliant	8bc06acc6e	Move StartLimitIntervalSec=0 from [Service] to [Unit] This solves the warning message: > systemd[1]: /usr/lib/systemd/system/doh-client.service:16: Unknown key 'StartLimitIntervalSec' in section [Service], ignoring.	2025-05-24 12:45:26 +00:00
Star Brilliant	0263a32c22	Merge pull request #173 from vinnyperella/patch-1	2025-05-18 00:10:28 +00:00
Vinny	354d0377b3	chore: upgrade dependencies	2025-05-14 19:26:12 +00:00
Star Brilliant	59a47c881b	Merge pull request #171 from m13253/m13253/restart-backoff When systemd service fail to start, use an exponential backoff delay to restart it	2025-05-13 01:50:24 +00:00
Star Brilliant	03da3a801f	When systemd service fail to start, use an exponential backoff delay to restart it This solves an issue that on (at least) Fedora and if NetworkManager starts too slow, systemd may stop trying to start it.	2025-05-09 00:12:11 +00:00
GreyXor	f13dea391f	chore: v2.3.10	2025-03-29 01:02:43 +01:00
GreyXor	45edaad516	chore: upgrade dependencies	2025-03-29 01:00:16 +01:00
Star Brilliant	2179ee0054	Merge pull request #169 from vinnyperella/patch-4 Update go.yml	2025-03-28 14:07:47 +00:00
Vinny	6ddb1ad401	Update go.yml Updated actions checkout/cache to v4.	2025-03-28 14:04:53 +00:00
GreyXor	35e0835949	chore: v2.3.9	2025-03-28 12:20:42 +01:00
GreyXor	5c744889be	chore: upgrade dependencies	2025-03-28 11:47:07 +01:00
GreyXor	cb1c336217	chore: upgrade dependencies	2025-02-20 10:41:30 +01:00
GreyXor	f82ac1118e	feat: new version 2.3.8	2025-01-28 09:09:13 +01:00
GreyXor	e5fef5690e	chore: upgrade package dependencies	2025-01-28 09:07:28 +01:00
GreyXor	9c997f1491	Merge pull request #166 from vinnyperella/patch-3 chore: update dependencies	2025-01-27 22:51:34 +01:00
Vinny	d33fc60182	chore: update dependencies	2025-01-27 15:01:08 -05:00
Vinny	89bb7e95a6	chore: update dependencies	2025-01-27 14:58:41 -05:00
GreyXor	c5a06988d5	chore: upgrade dependencies	2024-12-28 18:17:23 +01:00
Satish Gaikwad	ea57996685	Merge pull request #162 from m13253/add-multi-upstream-dns-servers	2024-12-20 08:41:18 -08:00
Satish Gaikwad	0a1aa98a01	Updated comment	2024-12-19 22:27:26 +00:00
Satish Gaikwad	7ca84d162f	Updated comment	2024-12-19 22:24:23 +00:00
Satish Gaikwad	0ea5c5015f	Added a note for multiple DNS server support in the container image	2024-12-17 18:56:10 +00:00
Satish Gaikwad	65424da23f	Update example to use multiple upstream DNS servers Update example to use multiple upstream DNS servers	2024-12-17 10:41:51 -08:00
GreyXor	d35e6a6117	chore: upgrade package dependencies	2024-11-14 12:47:00 +01:00
Star Brilliant	4a98f0997b	Update to actions/upload-artifact@v4	2024-11-13 18:58:47 +00:00