Redesigned schema

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6377 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/contrib/openldap/goserver.schema b/contrib/openldap/goserver.schema
index ee219fb99eeb6ba13a3d6833bc256d8b0e3529ff..32249739a442c108849db8fc717991598ef4eee4 100644 (file)
--- a/contrib/openldap/goserver.schema
+++ b/contrib/openldap/goserver.schema
@@ -443,18 +443,19 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.9.79 NAME 'goLogDB'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
        SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.80 NAME 'goLogDBServerUser'
+attributetype ( 1.3.6.1.4.1.10098.1.1.9.80 NAME 'goLogDBUser'
        DESC 'Auth user for logging DB'
        EQUALITY caseExactIA5Match
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
        SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.81 NAME 'goLogDBServerPassword'
+attributetype ( 1.3.6.1.4.1.10098.1.1.9.81 NAME 'goLogDBPassword'
        DESC 'Password for logging DB user'
        EQUALITY caseExactIA5Match
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
        SINGLE-VALUE)
 
+
 ##
 ##             Objectclasses
 ##
@@ -523,7 +524,7 @@ objectclass (1.3.6.1.4.1.10098.1.2.1.27 NAME 'goServer' SUP top AUXILIARY
 # LogDB Server description
 objectclass (1.3.6.1.4.1.10098.1.2.1.28 NAME 'goLogDBServer' SUP top AUXILIARY
        DESC 'Log DB server description (v2.4)'
-       MUST ( cn $ goLogDBServerUser $ goLogDBServerPassword $goLogDB )
+       MUST ( cn $ goLogAdmin $ goLogPassword )
        MAY  ( goLogDBServerStatus ))
 
 # Fon Server description
@@ -569,3 +570,7 @@ objectclass (1.3.6.1.4.1.10098.1.2.1.39 NAME 'goVirusServer' SUP top AUXILIARY
                avArchiveMaxFileSize $ avArchiveMaxRecursion $ avArchiveMaxCompressionRatio $
                avDatabaseMirror $ avChecksPerDay $ avHttpProxyURL ) )
 
+# LogDB Server description
+objectclass (1.3.6.1.4.1.10098.1.2.1.40 NAME 'gosaLogServer' SUP top AUXILIARY
+       DESC 'GOsa log server (v2.6)'
+       MUST ( cn $ goLogDB $ goLogDBUser $ goLogDBPassword ))