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

jakob at kirei.se jakob at kirei.se
Wed Jan 4 15:50:37 CET 2012


Author: jakob
Date: 2012-01-04 15:50:37 +0100 (Wed, 04 Jan 2012)
New Revision: 6002

Modified:
   trunk/OpenDNSSEC/conf/conf.rnc
   trunk/OpenDNSSEC/conf/conf.xml.in
   trunk/OpenDNSSEC/conf/kasp.rnc
   trunk/OpenDNSSEC/conf/kasp.xml.in
   trunk/OpenDNSSEC/conf/kasp2html.xsl
   trunk/OpenDNSSEC/conf/signconf.rnc
Log:
remove auditor tags

Modified: trunk/OpenDNSSEC/conf/conf.rnc
===================================================================
--- trunk/OpenDNSSEC/conf/conf.rnc	2012-01-04 14:47:36 UTC (rev 6001)
+++ trunk/OpenDNSSEC/conf/conf.rnc	2012-01-04 14:50:37 UTC (rev 6002)
@@ -125,15 +125,6 @@
 		# '%zone' in the string will be replaced by the zone name
 		# '%zonefile' in the string will be replaced by the zone file
 		element NotifyCommand { xsd:string }?
-	}?,
-
-	element Auditor {
-		# User & group to drop privs to
-		privs?,
-
-		# Location to store intermediate audit information
-		# DEFAULT: $(localstatedir)/opendnssec/tmp
-		element WorkingDirectory { xsd:string }?
 	}?
 }
 

Modified: trunk/OpenDNSSEC/conf/conf.xml.in
===================================================================
--- trunk/OpenDNSSEC/conf/conf.xml.in	2012-01-04 14:47:36 UTC (rev 6001)
+++ trunk/OpenDNSSEC/conf/conf.xml.in	2012-01-04 14:50:37 UTC (rev 6002)
@@ -87,15 +87,4 @@
 -->
 	</Signer>
 
-	<Auditor>
-<!--
-		<Privileges>
-			<User>opendnssec</User>
-			<Group>opendnssec</Group>
-		</Privileges>
--->
-
-		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
-	</Auditor>
-
 </Configuration>

Modified: trunk/OpenDNSSEC/conf/kasp.rnc
===================================================================
--- trunk/OpenDNSSEC/conf/kasp.rnc	2012-01-04 14:47:36 UTC (rev 6001)
+++ trunk/OpenDNSSEC/conf/kasp.rnc	2012-01-04 14:50:37 UTC (rev 6002)
@@ -123,12 +123,7 @@
 
 			# Expected parent SOA parameters
 			element SOA { anysoa }
-		},
-
-                element Audit {
-                       # Do a partial audit?
-                       partial?
-                }*
+		}
 	}*
 }
 

Modified: trunk/OpenDNSSEC/conf/kasp.xml.in
===================================================================
--- trunk/OpenDNSSEC/conf/kasp.xml.in	2012-01-04 14:47:36 UTC (rev 6001)
+++ trunk/OpenDNSSEC/conf/kasp.xml.in	2012-01-04 14:50:37 UTC (rev 6002)
@@ -86,10 +86,6 @@
 			</SOA>
 		</Parent>
 
-		<Audit>
-			<!-- <Partial /> -->
-		</Audit>
-
 	</Policy>
 	
 </KASP>

Modified: trunk/OpenDNSSEC/conf/kasp2html.xsl
===================================================================
--- trunk/OpenDNSSEC/conf/kasp2html.xsl	2012-01-04 14:47:36 UTC (rev 6001)
+++ trunk/OpenDNSSEC/conf/kasp2html.xsl	2012-01-04 14:50:37 UTC (rev 6002)
@@ -312,9 +312,6 @@
 		 </table>
 	</xsl:template>
 
-	<xsl:template match="Audit">
-	</xsl:template>
-
 	<xsl:template match="Keys/*/Algorithm">
 		<xsl:choose>
 			<xsl:when test=". = 0">

Modified: trunk/OpenDNSSEC/conf/signconf.rnc
===================================================================
--- trunk/OpenDNSSEC/conf/signconf.rnc	2012-01-04 14:47:36 UTC (rev 6001)
+++ trunk/OpenDNSSEC/conf/signconf.rnc	2012-01-04 14:50:37 UTC (rev 6002)
@@ -79,10 +79,7 @@
 		},
 
 		# What parameters to use for the SOA record
-		soa,
-		
-		# Auditing parameters
-		audit?
+		soa
 	}
 
 algorithm = element Algorithm { xsd:nonNegativeInteger { maxInclusive = "255" } }
@@ -116,6 +113,3 @@
 			element Salt { xsd:string }
 		}
 	}
-
-# This section is taken directly from the corresponding KASP policy
-audit = element Audit { empty }




More information about the Opendnssec-commits mailing list