diff --git a/Corefile b/Corefile index cb080e4..be5434f 100644 --- a/Corefile +++ b/Corefile @@ -1,7 +1,12 @@ +## resolve emerdns +coin.:53, emc.:53, lib.:53, bazar.:53, enum.:53 { + forward . 10.5.0.9:5335 +} + ## Resolve .meshname and .popura domains with the meshname protocol -meshname, popura { +meshname.:53, popura.:53 { acl { - allow net 127.0.0.0/8 ::1/128 + allow net 100.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ::1/128 fc00::/7 200::/7 block } meshname @@ -22,47 +27,131 @@ meshname, popura { #} ## Example .meship support -#meship { -# meship -#} +meship { + meship +} ## Resolve Alfis domains -anon, ygg { +anon.:53, btn.:53, conf.:53, index.:53, merch.:53, mirror.:53, mob.:53, screen.:53, srv.:53, ygg.:53 { acl { - allow net 127.0.0.0/8 ::1/128 + allow net 100.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ::1/128 fc00::/7 200::/7 block } - forward . [302:db60::53]:53 [300:6223::53]:53 [302:7991::53]:53 +# forward . [302:db60::53]:53 [300:6223::53]:53 [302:7991::53]:53 + forward . 10.5.0.3:53 +} + +## Onion (.onion) DNS resolution via Tor's DNSPort +onion.:53 { + acl { + allow net 100.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ::1/128 fc00::/7 200::/7 + block + } + # tor container listens on 9053 for DNS queries + forward . 10.5.0.7:9053 +} + +## i2p domain resolution via the built-in i2pd DNS server +i2p.:53 { + acl { + allow net 100.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ::1/128 fc00::/7 200::/7 + block + } + forward . 10.5.0.2:53 +} + +## Ethereum Name Service (ENS) via local ENS DNS microservice +eth.:53 { + acl { + allow net 100.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ::1/128 fc00::/7 200::/7 + block + } + forward . 10.5.0.11:53 +} + +## Namecoin (.bit) - privacy-preserving DNS +bit.:53 { + acl { + allow net 100.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ::1/128 fc00::/7 200::/7 + block + } + forward . 8.8.8.8:53 +} + +## Alternative DNS root (.alt) - for alternative nameroot systems +alt.:53 { + acl { + allow net 100.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ::1/128 fc00::/7 200::/7 + block + } + #ALT_FORWARDS # placeholder replaced by entrypoint script +} + +## Lokinet (.loki) - privacy network namespace +loki.:53 { + acl { + allow net 100.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ::1/128 fc00::/7 200::/7 + block + } + forward . 1.1.1.1:53 +} + +## Zilliqa blockchain (.zil) +zil.:53 { + acl { + allow net 100.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ::1/128 fc00::/7 200::/7 + block + } + forward . 1.1.1.1:53 +} + +## Web3 generic blockchain namespace (.web3) +web3.:53 { + acl { + allow net 100.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ::1/128 fc00::/7 200::/7 + block + } + forward . 1.1.1.1:53 +} + +## Tor-specific TLDs (.exit, .onion4, .onion6) +exit.:53, onion4.:53, onion6.:53 { + acl { + allow net 100.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ::1/128 fc00::/7 200::/7 + block + } + forward . 10.5.0.7:9053 } ## Resolve OpenNIC domains -bbs, chan, cyb, dyn, epic, geek, gopher, indy, libre, neo, null, o, oss, oz, parody, pirate, bazar, coin, emc, lib, fur, ku, te, ti, uu, ko, rm { +bbs.:53, chan.:53, cyb.:53, dyn.:53, epic.:53, geek.:53, gopher.:53, indy.:53, libre.:53, neo.:53, null.:53, o.:53, oss.:53, oz.:53, parody.:53, pirate.:53, fur.:53, ku.:53, te.:53, ti.:53, uu.:53, ko.:53, rm.:53 { acl { - allow net 127.0.0.0/8 ::1/128 + allow net 100.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ::1/128 fc00::/7 200::/7 block } forward . [324:71e:281a:9ed3::53]:53 [200:2892:d0f:bc20:8a8e:c7be:9d9e:ab55]:53 } ## Resolve legacy centralized Internet domains -. { +# this is the “catch‑all” zone. recursion is no longer restricted by ACL; +# any client may perform lookups. the previous ACL has been removed so that +# the service behaves like an ordinary recursive resolver. keep an eye on +# performance if you expose this to untrusted networks. +.:53 { hosts { fallthrough } - acl { - allow net 127.0.0.0/8 ::1/128 - ## Use this line instead to allow all LAN/private network clients - #allow net 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ::1/128 fc00::/7 - block - } ## Resolve all other DNS queries via AdGuard with DNS-over-TLS encryption - forward . tls://94.140.14.14:853 tls://94.140.15.15:853 { - tls_servername dns.adguard.com - health_check 5s - } +# forward . tls://94.140.14.14:853 tls://94.140.15.15:853 { +# tls_servername dns.adguard.com +# health_check 5s +# } ## Forward to unencrypted DNS servers #forward . [324:71e:281a:9ed3::53]:53 [302:db60::53]:53 [300:6223::53]:53 [325:5a4:d1c9:db96::53]:53 #forward . 1.1.1.1:53 8.8.8.8:53 +# forward . 138.197.140.189 147.93.130.20 168.235.111.72 162.243.19.47 + # Forward to local unbound recursive server + forward . 10.5.0.5:53 } diff --git a/Dockerfile b/Dockerfile index 8698d5b..0d85348 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,74 @@ -FROM golang:1.17-bullseye +# --- Stage 1: Build --- +FROM --platform=$BUILDPLATFORM golang:1.24-bullseye AS builder -RUN apt-get update && apt-get -uy upgrade -RUN apt-get -y install ca-certificates \ - && update-ca-certificates -RUN git clone -b v1.8.6 --depth 1 https://github.com/coredns/coredns.git /src -RUN cd /src \ - && go get github.com/zhoreeq/coredns-meshname \ - && go mod download +ARG BUILDPLATFORM +ARG TARGETPLATFORM +ARG TARGETARCH -# NOTE: direct copying to /src/plugin.cfg doesn't work for some reason -COPY plugin.cfg /plugin.cfg -RUN cd /src && cat /plugin.cfg > plugin.cfg && make +# Enable CGO for the libc-dev dependencies required by CoreDNS +ENV CGO_ENABLED=1 +RUN apt-get update && apt-get install -y --no-install-recommends \ + git \ + make \ + gcc \ + libc6-dev \ + ca-certificates \ + && rm -rf /var/lib/apt/lists/* + +# Set up source directory +WORKDIR /src + +# 1. Clone CoreDNS v1.13.1 +RUN git clone -b v1.13.1 --depth 1 https://github.com/coredns/coredns.git . + +# 2. Inject your custom plugin.cfg +COPY plugin.cfg /src/plugin.cfg + +## 3. Fetch external plugins and tidy modules +## We use a cache mount for /go/pkg/mod to make subsequent builds much faster +#RUN --mount=type=cache,target=/go/pkg/mod \ +# go get github.com/zhoreeq/coredns-meshname \ +# github.com/zhoreeq/coredns-meship && \ +# go mod tidy +# +## 4. Compile CoreDNS +# 3. Register plugins and fetch dependencies +# 'go generate' creates the necessary glue code for the new plugins +RUN go generate && \ + go mod tidy && \ + go get github.com/zhoreeq/coredns-meshname && \ + go get github.com/zhoreeq/coredns-meship && \ + go mod tidy + +# 4. Compile with optimized flags +RUN make + +# --- Stage 2: Runtime --- FROM debian:stable-slim -COPY Corefile.example /Corefile -COPY --from=0 /etc/ssl/certs /etc/ssl/certs -COPY --from=0 /src/coredns /coredns +ARG TARGETARCH -EXPOSE 53 53/udp -EXPOSE 853 -EXPOSE 443 -ENTRYPOINT ["/coredns"] +# Install runtime dependencies: +# - ca-certificates: for secure upstream forwarding (TLS) +# - dnsutils: provides 'nslookup' for the Docker healthcheck +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates \ + dnsutils \ + curl \ + && rm -rf /var/lib/apt/lists/* + +# Copy the compiled binary and the Corefile +COPY --from=builder /src/coredns /coredns +COPY ./Corefile /Corefile + +# copy entrypoint script that updates alt hints +COPY ./entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +# Expose standard DNS ports +EXPOSE 53/tcp 53/udp 853/tcp 443/tcp + +# Run our wrapper entrypoint which updates hints then launches CoreDNS +ENTRYPOINT ["/entrypoint.sh"] +CMD ["-conf", "/Corefile"] diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/README.md b/README.md deleted file mode 100644 index 6fcfb1d..0000000 --- a/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# PopuraDNS - -PopuraDNS is a simple DNS server with decentralized domain names support. - -PopuraDNS can: - -- Secure all your regular DNS queries with [DNS-over-TLS](https://en.wikipedia.org/wiki/DNS_over_TLS) -- Resolve the [meshname protocol](https://github.com/zhoreeq/meshname) domains -- Resolve [Alfis blockchain](https://github.com/Revertron/Alfis) domains -- Resolve [OpenNIC alternative DNS root](https://www.opennic.org/) domains -- Can work as an authoritative server for your domains - -## Usage - -Building from source (requires Golang >=1.17): - - git clone https://github.com/popura-network/PopuraDNS - cd PopuraDNS - ./build.sh - -Run PopuraDNS on port 53535 with a default config file: - - ./coredns -p 53535 -conf ./Corefile - -See the `contrib` directory for systemd and openrc example files. - -For Docker tips, see `docs/DOCKER_TIPS.md` - -## Configuration - -PopuraDNS is a special build of CoreDNS. -See `Corefile` for example PopuraDNS configuration file. - -To list all available plugins, run `./coredns -plugins` - -For more information read the [CoreDNS docs](https://coredns.io/manual/toc/#configuration). diff --git a/build.sh b/build.sh deleted file mode 100755 index 2148538..0000000 --- a/build.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -WORKDIR="$PWD" -SOURCE=${SOURCE:-"https://github.com/coredns/coredns.git"} -BUILDDIR=${BUILDDIR:-"build"} -SYSTEM=${SYSTEM:-""} -OUTFILE=${OUTFILE:-"coredns"} -WINDOWS=${WINDOWS:-"0"} - -if [ $WINDOWS = "1" ]; then - SYSTEM="GOOS=windows GOARCH=amd64" - OUTFILE="coredns.exe" -fi - -if [ -d $BUILDDIR ]; then - rm -rf $BUILDDIR || exit 2 -fi - -echo "getting the CoreDNS source..." -git clone -b v1.8.6 --depth 1 $SOURCE $BUILDDIR -if [ ! -d $BUILDDIR ]; then - echo "error: can't get the source code" - exit 2 -fi - -echo "building PopuraDNS..." -cd $BUILDDIR -cp $WORKDIR/plugin.cfg . -go get github.com/zhoreeq/coredns-meshname -go get github.com/zhoreeq/coredns-meship -go mod download - -echo "building..." -make SYSTEM="$SYSTEM" BINARY=$WORKDIR/$OUTFILE - -echo "success! your binary is ready, senpai" -echo "$WORKDIR/$OUTFILE" diff --git a/clean.sh b/clean.sh deleted file mode 100755 index fbb6d94..0000000 --- a/clean.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -rm -rf build coredns coredns.exe diff --git a/contrib/coredns.openrc b/contrib/coredns.openrc deleted file mode 100644 index 2f53634..0000000 --- a/contrib/coredns.openrc +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/openrc-run -name="coredns" -description="Experimental DNS server for mesh networks" -supervisor=supervise-daemon -command=/usr/local/bin/coredns -command_args="-conf /etc/coredns/Corefile" - -depend() { - need net - after firewall - before radvd -} diff --git a/contrib/coredns.service b/contrib/coredns.service deleted file mode 100644 index 0a8c82b..0000000 --- a/contrib/coredns.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=CoreDNS DNS server -Documentation=https://coredns.io -After=network.target - -[Service] -PermissionsStartOnly=true -LimitNOFILE=1048576 -LimitNPROC=512 -CapabilityBoundingSet=CAP_NET_BIND_SERVICE -AmbientCapabilities=CAP_NET_BIND_SERVICE -NoNewPrivileges=true -User=coredns -ExecStart=/usr/bin/coredns -conf=/etc/coredns/Corefile -ExecReload=/bin/kill -SIGUSR1 $MAINPID -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/docs/DOCKER_TIPS.md b/docs/DOCKER_TIPS.md deleted file mode 100644 index 9eeb85c..0000000 --- a/docs/DOCKER_TIPS.md +++ /dev/null @@ -1,22 +0,0 @@ -coredns in containers -===================== - -Pull the image from docker hub: - - docker pull zhoreeq/coredns - -or build the image from source: - - docker build -t coredns . - -Run with a default config: - - docker run -dt --name=coredns --restart=unless-stopped --ip=172.17.0.2 --ip6=300:49df:7fbd:1987::100 coredns - -Run with a custom config and a custom zone file: - - docker run -it -v /home/user/CustomConfig:/Corefile -v /home/user/custom.zonefile:/custom.zonefile coredns - -## Yggdrasil support - -To enable Yggdrasil's IPv6 in Docker containers read [this](https://docs.docker.com/config/daemon/ipv6/) diff --git a/docs/example.zonefile b/docs/example.zonefile deleted file mode 100644 index 1c90385..0000000 --- a/docs/example.zonefile +++ /dev/null @@ -1,7 +0,0 @@ -$ORIGIN aiql7yv7ka6ck5mxpfnugi3hoe.popura. -$TTL 3600 -aiql7yv7ka6ck5mxpfnugi3hoe.popura. IN SOA aiql7yv7ka6ck5mxpfnugi3hoe.popura. admin.aiql7yv7ka6ck5mxpfnugi3hoe.popura. ( 1111111111 7200 3600 1209600 3600 ) - -@ IN AAAA 220:bfe2:bf50:3c25:7597:795b:4323:6771 -www IN CNAME aiql7yv7ka6ck5mxpfnugi3hoe.popura. -lofi IN AAAA 320:bfe2:bf50:3c25::f diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000..1f60605 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,43 @@ +#!/bin/sh +set -e + +log() { + # send messages to stderr so Docker logs capture them even if stdout is used by CoreDNS + echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1" >&2 +} + +# Attempt to fetch .alt root hints from known sources +generate_alt_forwards() { + # try hostnames first + log "Fetching .alt hints from alt.root-servers.org (may require external DNS)" + hints=$(curl --connect-timeout 5 --max-time 8 -fsSL https://alt.root-servers.org/hints.txt 2>/dev/null || true) + if [ -z "$hints" ]; then + log "hostname fetch failed, trying hard-coded IP fallback" + hints=$(curl --connect-timeout 5 --max-time 8 -fsSL http://185.121.177.177/hints.txt 2>/dev/null || true) + fi + if [ -z "$hints" ]; then + log "no hints available, leaving placeholder intact" + return + fi + echo "$hints" | awk '{print " forward . " $1 ":53"}' +} + +# Replace placeholder in Corefile with actual forwards (or leave empty) +update_corefile() { + forwards=$(generate_alt_forwards) + if [ -n "$forwards" ]; then + log "updating Corefile alt forwards" + awk -v fwd="$forwards" ' + /#ALT_FORWARDS/ { + print fwd; next + } + { print } + ' /Corefile > /Corefile.new && mv /Corefile.new /Corefile + fi +} + +log "running entrypoint" +update_corefile + +# Exec CoreDNS with provided arguments +exec /coredns "$@" diff --git a/install.sh b/install.sh deleted file mode 100755 index 8cd623f..0000000 --- a/install.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -cp coredns /usr/local/bin/ -mkdir -p /etc/coredns -cp Corefile.example /etc/coredns/Corefile -cp contrib/coredns.service /etc/systemd/system/ -systemctl enable --now coredns.service - -echo "Configure your system DNS settings to server '127.0.0.1'" diff --git a/plugin.cfg b/plugin.cfg index cc33b71..cfb8103 100644 --- a/plugin.cfg +++ b/plugin.cfg @@ -48,6 +48,8 @@ dnssec:dnssec #autopath:autopath template:template transfer:transfer +meshname:github.com/zhoreeq/coredns-meshname +meship:github.com/zhoreeq/coredns-meship hosts:hosts #route53:route53 #azure:azure @@ -65,5 +67,3 @@ forward:forward #whoami:whoami on:github.com/coredns/caddy/onevent sign:sign -meshname:github.com/zhoreeq/coredns-meshname -meship:github.com/zhoreeq/coredns-meship