change port

dmachard · Feb 20, 2024 · c27e300 · c27e300
1 parent 0b71720
commit c27e300
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/testing-dnstap.yml b/.github/workflows/testing-dnstap.yml
@@ -217,9 +217,8 @@ jobs:
 
     - name: Deploy dnsdist docker image
       run: |
-        sudo docker run -d --network="host" --name=dnsdist --volume=$PWD/testsdata/powerdns/dnsdist_doqdoh.conf:/etc/dnsdist/conf.d/dnsdist.conf:z -v $PWD/server.key:/etc/dnsdist/conf.d/key.pem -v $PWD/server.crt:/etc/dnsdist/conf.d/cert.pem powerdns/dnsdist-${{ matrix.dnsdist }}
-        sudo docker logs dnsdist
-        #until (dig -p 5553 www.github.com @127.0.0.1 | grep NOERROR); do sleep 5.0; done
+        sudo docker run -d --network="host" --name=dnsdist --volume=$PWD/testsdata/powerdns/dnsdist_doqdoh.conf:/etc/dnsdist/conf.d/dnsdist.conf:z -v $PWD/server.key:/etc/dnsdist/conf.d/key.pem:z -v $PWD/server.crt:/etc/dnsdist/conf.d/cert.pem:z powerdns/dnsdist-${{ matrix.dnsdist }}
+        until (dig -p 5553 www.github.com @127.0.0.1 | grep NOERROR); do sleep 5.0; done
 
     - name: Tests
       run: |

diff --git a/testsdata/powerdns/dnsdist_doqdoh.conf b/testsdata/powerdns/dnsdist_doqdoh.conf
@@ -1,13 +1,13 @@
 setLocal('0.0.0.0:5553')
 
-addDOQLocal('0.0.0.0:8853', '/etc/dnsdist/conf.d/cert.pem', '/etc/dnsdist/conf.d/key.pem')
-addDOHLocal('0.0.0.0:8443', '/etc/dnsdist/conf.d/cert.pem', '/etc/dnsdist/conf.d/key.pem')
-addDOH3Local('0.0.0.0:8443', '/etc/dnsdist/conf.d/cert.pem', '/etc/dnsdist/conf.d/key.pem')
+addDOQLocal('0.0.0.0:55853', '/etc/dnsdist/conf.d/cert.pem', '/etc/dnsdist/conf.d/key.pem')
+addDOHLocal('0.0.0.0:55443', '/etc/dnsdist/conf.d/cert.pem', '/etc/dnsdist/conf.d/key.pem')
+addDOH3Local('0.0.0.0:55443', '/etc/dnsdist/conf.d/cert.pem', '/etc/dnsdist/conf.d/key.pem')
 
 fstl = newFrameStreamTcpLogger("127.0.0.1:6000")
 
-addAction(AllRule(), DnstapLogAction("dnsdist-tcp", fstl))
-addResponseAction(AllRule(), DnstapLogResponseAction("dnsdist-tcp", fstl))
-addCacheHitResponseAction(AllRule(), DnstapLogResponseAction("dnsdist-tcp", fstl))
+addAction(AllRule(), DnstapLogAction("dnsdist", fstl))
+addResponseAction(AllRule(), DnstapLogResponseAction("dnsdist", fstl))
+addCacheHitResponseAction(AllRule(), DnstapLogResponseAction("dnsdist", fstl))
 
 newServer('8.8.8.8')