[PR #2672] [MERGED] Simplify server configuration #3224

New issue

Closed

opened 2026-03-16 11:31:58 +03:00 by kerem · 0 comments

kerem commented

2026-03-16 11:31:58 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hickory-dns/hickory-dns/pull/2672
Author: @djc
Created: 12/13/2024
Status: ✅ Merged
Merged: 12/19/2024
Merged by: @djc

Base: main ← Head: server-config

📝 Commits (3)

d18dba2 server: inline tiny modules
b86c779 bin: use PathBuf/Path for paths
c155472 bin: remove remnants of deprecated SQLite config path

📊 Changes

17 files changed (+99 additions, -208 deletions)

View changed files

📝 bin/src/hickory-dns.rs (+2 -6)
📝 bin/src/lib.rs (+5 -19)
📝 bin/tests/integration/authority_battery/basic.rs (+2 -2)
📝 bin/tests/integration/authority_battery/dnssec.rs (+2 -1)
📝 bin/tests/integration/authority_battery/dynamic_update.rs (+2 -1)
📝 bin/tests/integration/config_tests.rs (+10 -25)
📝 bin/tests/integration/store_file_tests.rs (+9 -6)
📝 bin/tests/integration/store_sqlite_tests.rs (+5 -5)
📝 crates/server/src/store/file/authority.rs (+18 -6)
➖ crates/server/src/store/file/config.rs (+0 -16)
📝 crates/server/src/store/file/mod.rs (+12 -3)
➖ crates/server/src/store/forwarder/config.rs (+0 -20)
📝 crates/server/src/store/forwarder/mod.rs (+14 -4)
➖ crates/server/src/store/sqlite/config.rs (+0 -21)
📝 crates/server/src/store/sqlite/mod.rs (+18 -4)
➖ tests/test-data/test_configs/dnssec_with_update_deprecated.toml (+0 -66)
📝 tests/test-data/test_configs/example.toml (+0 -3)

📄 Description

From reviewing #2668. Happy to rebase on top of those changes.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/hickory-dns/hickory-dns/pull/2672 **Author:** [@djc](https://github.com/djc) **Created:** 12/13/2024 **Status:** ✅ Merged **Merged:** 12/19/2024 **Merged by:** [@djc](https://github.com/djc) **Base:** `main` ← **Head:** `server-config` --- ### 📝 Commits (3) - [`d18dba2`](https://github.com/hickory-dns/hickory-dns/commit/d18dba2ea591581b8d3b173cf187ada4c4349e2b) server: inline tiny modules - [`b86c779`](https://github.com/hickory-dns/hickory-dns/commit/b86c779f19e4c9f59455e144735597204ecb06ab) bin: use PathBuf/Path for paths - [`c155472`](https://github.com/hickory-dns/hickory-dns/commit/c155472a89568ca981f672278d383013e1279fc2) bin: remove remnants of deprecated SQLite config path ### 📊 Changes **17 files changed** (+99 additions, -208 deletions) <details> <summary>View changed files</summary> 📝 `bin/src/hickory-dns.rs` (+2 -6) 📝 `bin/src/lib.rs` (+5 -19) 📝 `bin/tests/integration/authority_battery/basic.rs` (+2 -2) 📝 `bin/tests/integration/authority_battery/dnssec.rs` (+2 -1) 📝 `bin/tests/integration/authority_battery/dynamic_update.rs` (+2 -1) 📝 `bin/tests/integration/config_tests.rs` (+10 -25) 📝 `bin/tests/integration/store_file_tests.rs` (+9 -6) 📝 `bin/tests/integration/store_sqlite_tests.rs` (+5 -5) 📝 `crates/server/src/store/file/authority.rs` (+18 -6) ➖ `crates/server/src/store/file/config.rs` (+0 -16) 📝 `crates/server/src/store/file/mod.rs` (+12 -3) ➖ `crates/server/src/store/forwarder/config.rs` (+0 -20) 📝 `crates/server/src/store/forwarder/mod.rs` (+14 -4) ➖ `crates/server/src/store/sqlite/config.rs` (+0 -21) 📝 `crates/server/src/store/sqlite/mod.rs` (+18 -4) ➖ `tests/test-data/test_configs/dnssec_with_update_deprecated.toml` (+0 -66) 📝 `tests/test-data/test_configs/example.toml` (+0 -3) </details> ### 📄 Description From reviewing #2668. Happy to rebase on top of those changes. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>