From: Aleš Mrázek <ales.mrazek@nic.cz>
Date: Fri, 21 Jun 2024 04:10:11 +0000 (+0200)
Subject: manager: YAML configs moved to the repository root 'etc' dir
X-Git-Tag: v6.0.9~27^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed4e63dab1d65f2653fda78b069d23ba09ab9b4a;p=thirdparty%2Fknot-resolver.git

manager: YAML configs moved to the repository root 'etc' dir
---

diff --git a/manager/etc/knot-resolver/.gitignore b/etc/config/.gitignore
similarity index 56%
rename from manager/etc/knot-resolver/.gitignore
rename to etc/config/.gitignore
index fb64123a4..7a814b879 100644
--- a/manager/etc/knot-resolver/.gitignore
+++ b/etc/config/.gitignore
@@ -1,2 +1,2 @@
 runtime/
-cache/ 
\ No newline at end of file
+cache/
\ No newline at end of file
diff --git a/manager/etc/knot-resolver/config.dev.yaml b/etc/config/config.dev.yaml
similarity index 96%
rename from manager/etc/knot-resolver/config.dev.yaml
rename to etc/config/config.dev.yaml
index aa97a41fa..ef25a37ae 100644
--- a/manager/etc/knot-resolver/config.dev.yaml
+++ b/etc/config/config.dev.yaml
@@ -43,14 +43,14 @@ local-data:
       address: 1.2.3.4
       nodata: true
       tags: [t01]
-    - file: hosts.custom
-      tags: [t02]
-      ttl: 10m
     - subtree: empty
       tags: [ t02 ]
       name: [ example1.org ]
     - subtree: nxdomain
       name: [ sub4.example.org ]
+  #   - file: hosts.custom
+  #     tags: [t02]
+  #     ttl: 10m
   # rpz:
   #   - file: runtime/blocklist.rpz
   #     tags: [t01, t02]
diff --git a/manager/etc/knot-resolver/config.example.docker.yaml b/etc/config/config.example.docker.yaml
similarity index 100%
rename from manager/etc/knot-resolver/config.example.docker.yaml
rename to etc/config/config.example.docker.yaml
diff --git a/manager/etc/knot-resolver/config.example.internal.yaml b/etc/config/config.example.internal.yaml
similarity index 100%
rename from manager/etc/knot-resolver/config.example.internal.yaml
rename to etc/config/config.example.internal.yaml
diff --git a/manager/etc/knot-resolver/config.example.isp.yaml b/etc/config/config.example.isp.yaml
similarity index 100%
rename from manager/etc/knot-resolver/config.example.isp.yaml
rename to etc/config/config.example.isp.yaml
diff --git a/manager/etc/knot-resolver/config.example.personal.yaml b/etc/config/config.example.personal.yaml
similarity index 100%
rename from manager/etc/knot-resolver/config.example.personal.yaml
rename to etc/config/config.example.personal.yaml
diff --git a/manager/etc/knot-resolver/config.yaml b/etc/config/config.yaml
similarity index 100%
rename from manager/etc/knot-resolver/config.yaml
rename to etc/config/config.yaml