Merge branch 'master' of labo.lacoloc.cafe:june/dns-witch

2021-02-20 17:23:36 +01:00 · 2021-02-20 17:23:36 +01:00 · 8ed2709794
parent 876488857e df5e5df18f
commit 8ed2709794
3 changed files with 20 additions and 6 deletions
--- a/knot.conf
+++ b/knot.conf
@ -68,8 +68,11 @@ zone:

  - domain: wicce.eu.org
  
-  - domain: mail.dns-witch.net.eu.org
-  
+=======
+
+  - domain: stryges.fr.eu.org
+
+>>>>>>> df5e5df18faf5ae735479481bdc3e5f8f2866786
 #    # Slave zone
 #  - domain: example.net
 #    master: master
--- a/zones/grimoire.eu.org.zone
+++ b/zones/grimoire.eu.org.zone
@ -1,5 +1,5 @@
@                          10800   IN  SOA     grimoire.eu.org. june.lacoloc.cafe.  (
-                             2021010901   ;  Numero
+                             2021021801   ;  Numero
                             28800        ;  Refresh
                             14400        ;  Retry
                             3600000      ;  Expire
@ -11,6 +11,3 @@ ns1	IN 3600   A   185.82.202.26
@	IN 3600	  A   135.181.158.2
 ; AAAA Records
 ns1	IN 3600	  AAAA	 2a04:dd00:17:4:1::
-
-; CNAME Records
-june	IN 3600	CNAME @
--- a/zones/stryges.fr.eu.org.zone
+++ b/zones/stryges.fr.eu.org.zone
@ -0,0 +1,14 @@
+@                          10800   IN  SOA     stryges.fr.eu.org. june.lacoloc.cafe.  (
+                             2021021801   ;  Numero
+                             28800        ;  Refresh
+                             14400        ;  Retry
+                             3600000      ;  Expire
+                             86400 )      ;  Minimum
+
+@	IN 3600   NS  ns1.stryges.fr.eu.org.
+; A Records
+ns1	IN 3600   A   185.82.202.26
+@	IN 3600	  A   135.181.158.2
+; AAAA Records
+ns1	IN 3600	  AAAA	 2a04:dd00:17:4:1::
+