Skip to content

Commit

Permalink
feat(): remove DoT in favor of DoQ
Browse files Browse the repository at this point in the history
  • Loading branch information
peterthomassen committed Jan 22, 2024
1 parent 9e087e0 commit a3e1c87
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 133 deletions.
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ jobs:

- name: Create necessary symlinks in desec-stack # desec-stack is docker-compose base directory
run: |
ln -s ../desec-ns/dnsdist
ln -s ../desec-ns/dox-certs
ln -s ../desec-ns/ns
ln -s ../desec-ns/knot-exporter
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

This is a docker-compose application to run a nameserver. Zone data is automatically provided to this application via database replication. The application consists of

- `dnsdist`: Frontend DNS load balancer (dnsdist), currently forwarding to the `ns` container. It is mainly there to support more advanced features in the future.
- `ns`: Actual DNS server (PowerDNS).
- `ns`: Actual DNS server.
- `replicator`: Python container running a replication loop.
- `openvpn-client`: OpenVPN client container providing network services for `ns` and `replicator`.

Expand Down Expand Up @@ -74,7 +73,7 @@ Take a backup file created in the previous step and store it at `./lmdb-backup/b
exposing ports on the host IPv6 address through `docker-proxy`.

- This stack is IPv6-capable. To prevent evil people from abusing this app for DNS amplification attacks, it is highly recommended to rate limit requests by IP (or take
some smarter precaution). In particular, consider using the iptables hashlimit module, or dnsdist's traffic policy settings.
some smarter precaution). In particular, consider using he nameserver's policy settings, or the iptables hashlimit module.

When using iptables, note that whenever you restart the docker daemon or this application (`docker-compose down; docker-compose up`), docker will insert its own rules
at the top of the chain. You therefore have to make sure that these rules get re-applied whenever docker decides to jump the queue.
Expand Down
31 changes: 0 additions & 31 deletions dnsdist/Dockerfile

This file was deleted.

48 changes: 0 additions & 48 deletions dnsdist/conf/dnsdist.conf

This file was deleted.

3 changes: 0 additions & 3 deletions dnsdist/entrypoint.sh

This file was deleted.

2 changes: 1 addition & 1 deletion docker-compose.connect-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
- openvpn-server
networks:
nsfront:
ipv4_address: 10.16.0.127 # reaches dnsdist at 10.16.0.2
ipv4_address: 10.16.0.127

networks:
vpnconnect:
Expand Down
4 changes: 0 additions & 4 deletions docker-compose.dump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ version: '2.2'

# mostly extending from main .yml
services:
dnsdist:
entrypoint: ["echo", "Service disabled"]
restart: "no"

openvpn-client_monitor:
entrypoint: ["echo", "Service disabled"]
restart: "no"
Expand Down
36 changes: 0 additions & 36 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,33 +64,6 @@ services:
tag: "desec-ns/knot-exporter"
restart: unless-stopped

dnsdist:
build: dnsdist
image: ${DOCKER_REGISTRY}desec/desec-ns-dnsdist:latest
init: true
depends_on:
- ns
- dox-certs
cap_add:
- NET_ADMIN
ports:
- "${DESEC_NS_PUBLIC_PORT_DOT:-853}:853/tcp"
environment:
- DESEC_NS_CARBONSERVER
- DESEC_NS_CARBONOURNAME
volumes:
- dox-certs:/etc/dnsdist/certs
networks:
nsmiddle:
ipv4_address: 10.16.2.3
nsrearmonitoring_dnsdist:
ipv4_address: 10.16.4.10
logging:
driver: "syslog"
options:
tag: "desec-ns/dnsdist"
restart: unless-stopped

openvpn-client:
build: openvpn-client
image: desec/openvpn-client:latest
Expand Down Expand Up @@ -160,8 +133,6 @@ services:
- prometheus:/prometheus
networks:
nsrearmonitoring_openvpn-client:
nsrearmonitoring_dnsdist:
ipv4_address: 10.16.4.11
logging:
driver: "syslog"
options:
Expand Down Expand Up @@ -209,10 +180,3 @@ networks:
config:
- subnet: 10.16.4.0/29
gateway: 10.16.4.1
nsrearmonitoring_dnsdist:
driver: bridge
ipam:
driver: default
config:
- subnet: 10.16.4.8/29
gateway: 10.16.4.9
6 changes: 0 additions & 6 deletions prometheus/conf/prometheus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ scrape_configs:
- job_name: 'openvpn-client'
static_configs:
- targets: ['openvpn-client_monitor:9176']
- job_name: 'dnsdist'
static_configs:
- targets: ['dnsdist:8083']
basic_auth:
username: arbitrary
password: we+ensure+security+via+network+segmentation
- job_name: 'knot-exporter'
static_configs:
- targets: ['knot-exporter:9433']

0 comments on commit a3e1c87

Please sign in to comment.