[Opendnssec-commits] [svn.opendnssec.org/svn/dnssec] r6094 - trunk/OpenDNSSEC/conf

jakob at kirei.se jakob at kirei.se
Wed Jan 25 10:43:13 CET 2012


Author: jakob
Date: 2012-01-25 10:43:13 +0100 (Wed, 25 Jan 2012)
New Revision: 6094

Added:
   trunk/OpenDNSSEC/conf/enforcerstate.xml
Modified:
   trunk/OpenDNSSEC/conf/Makefile.am
   trunk/OpenDNSSEC/conf/enforcerstate.rnc
Log:
add enforcerstate stuff, not yet finalized

Modified: trunk/OpenDNSSEC/conf/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/conf/Makefile.am	2012-01-25 09:41:53 UTC (rev 6093)
+++ trunk/OpenDNSSEC/conf/Makefile.am	2012-01-25 09:43:13 UTC (rev 6094)
@@ -2,9 +2,9 @@
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
-RNC =	addns.rnc conf.rnc kasp.rnc zonelist.rnc signconf.rnc
-RNG =	addns.rng conf.rng kasp.rng zonelist.rng signconf.rng
-XML =	addns.xml conf.xml kasp.xml zonelist.xml signconf.xml
+RNC =	addns.rnc conf.rnc kasp.rnc zonelist.rnc signconf.rnc enforcerstate.rnc
+RNG =	addns.rng conf.rng kasp.rng zonelist.rng signconf.rng enforcerstate.rng
+XML =	addns.xml conf.xml kasp.xml zonelist.xml signconf.xml enforcerstate.xml
 XSL=	kasp2html.xsl
 
 TRANG=	$(srcdir)/trang/trang.jar

Modified: trunk/OpenDNSSEC/conf/enforcerstate.rnc
===================================================================
--- trunk/OpenDNSSEC/conf/enforcerstate.rnc	2012-01-25 09:41:53 UTC (rev 6093)
+++ trunk/OpenDNSSEC/conf/enforcerstate.rnc	2012-01-25 09:43:13 UTC (rev 6094)
@@ -46,7 +46,11 @@
 # );
 
 zone = element Zone {
+	# Name of zone
+	attribute name { xsd:string },
+
 	element Keys { key+ },
+
 	element NSEC3 {
 		element Salt { xsd:string },
 
@@ -77,15 +81,15 @@
 	attribute id { xsd:string },
 
 	# reference to KeyPair at id
-	element KeyPair { xsd:string },
+	element KeyPairId { xsd:string },
 
 	element Type { "KSK" | "ZSK" | "CSK" },
 
-	element Publish { xsd:dateTime | empty },
-	element Ready { xsd:dateTime | empty },
-	element Active { xsd:dateTime | empty },
-	element Retire { xsd:dateTime | empty },
-	element Dead { xsd:dateTime | empty }
+	element Publish { xsd:dateTime | empty }?,
+	element Ready { xsd:dateTime | empty }?,
+	element Active { xsd:dateTime | empty }?,
+	element Retire { xsd:dateTime | empty }?,
+	element Dead { xsd:dateTime | empty }?
 }
 
 
@@ -115,7 +119,7 @@
 
 	# where to locate the key; HSM and CKA_ID
 	element Repository { xsd:string },
-	element Identifier { xsd:string },
+	element Locator { xsd:string },
 
 	# under what policy was the key pair generated (if applicable)
 	element Policy { xsd:string }?,


Property changes on: trunk/OpenDNSSEC/conf/enforcerstate.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Id




More information about the Opendnssec-commits mailing list