From ea4477630c763d702e532a0ad167d1a47df205ab Mon Sep 17 00:00:00 2001 From: cajus Date: Tue, 16 Sep 2008 07:58:49 +0000 Subject: [PATCH] Updated schema and classes. Closes #378. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12463 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../systems/services/syslog/class_goLogDBServer.inc | 8 ++++---- .../admin/systems/services/syslog/goLogDBServer.tpl | 12 ++++++------ gosa-plugins/goto/contrib/goserver.ldif | 1 + gosa-plugins/goto/contrib/goserver.schema | 8 +++++++- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/gosa-plugins/goto/admin/systems/services/syslog/class_goLogDBServer.inc b/gosa-plugins/goto/admin/systems/services/syslog/class_goLogDBServer.inc index 30b970bc6..69a05f2ba 100644 --- a/gosa-plugins/goto/admin/systems/services/syslog/class_goLogDBServer.inc +++ b/gosa-plugins/goto/admin/systems/services/syslog/class_goLogDBServer.inc @@ -8,7 +8,7 @@ class goLogDBServer extends goService{ /* This plugin only writes its objectClass */ var $objectclasses = array("goLogDBServer"); - var $attributes = array("goLogAdmin", "goLogPassword" , "goLogDB"); + var $attributes = array("goLogAdmin", "goLogPassword" , "gosaLogDB"); var $StatusFlag = "goLogDBServerStatus"; /* This class can't be assigned twice so it conflicts with itsself */ @@ -21,7 +21,7 @@ class goLogDBServer extends goService{ var $goLogDBServerStatus = ""; var $goLogAdmin = ""; var $goLogPassword = ""; - var $goLogDB = "gomon"; + var $gosaLogDB = "gomon"; var $view_logged =FALSE; @@ -71,7 +71,7 @@ class goLogDBServer extends goService{ if (empty($this->goLogPassword)){ $message[]= msgPool::required(_("Password")); } - if (empty($this->goLogDB)){ + if (empty($this->gosaLogDB)){ $message[]= msgPool::required(_("Database")); } return($message); @@ -103,7 +103,7 @@ class goLogDBServer extends goService{ "restart" => _("Restart"), "goLogAdmin" => _("Admin"), "goLogPassword" => _("Password"), - "goLogDB" => _("Database")) + "gosaLogDB" => _("Database")) )); } } diff --git a/gosa-plugins/goto/admin/systems/services/syslog/goLogDBServer.tpl b/gosa-plugins/goto/admin/systems/services/syslog/goLogDBServer.tpl index b372fe64d..51a4393b8 100644 --- a/gosa-plugins/goto/admin/systems/services/syslog/goLogDBServer.tpl +++ b/gosa-plugins/goto/admin/systems/services/syslog/goLogDBServer.tpl @@ -1,18 +1,18 @@

{t}Logging database information{/t}

- + - + diff --git a/gosa-plugins/goto/contrib/goserver.ldif b/gosa-plugins/goto/contrib/goserver.ldif index 9c5f185e6..b655c6ed3 100644 --- a/gosa-plugins/goto/contrib/goserver.ldif +++ b/gosa-plugins/goto/contrib/goserver.ldif @@ -19,6 +19,7 @@ olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.9.20 NAME 'goKrbAdmin' DESC 'Admin pr olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.9.21 NAME 'goKrbPassword' DESC 'Admin password for kerberos server' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE) olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.9.22 NAME 'goFaxAdmin' DESC 'Admin principal for fax server' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE) olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.9.23 NAME 'goFaxPassword' DESC 'Admin password for fax server' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE) +olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.9.83 NAME 'gosaLogDB' DESC 'GOsa logging DB name' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE) olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.9.24 NAME 'goLogAdmin' DESC 'Admin principal for log server' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE) olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.9.25 NAME 'goLogPassword' DESC 'Admin password for log server' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE) olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.9.26 NAME 'goFonAdmin' DESC 'Admin principal for fon server' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE) diff --git a/gosa-plugins/goto/contrib/goserver.schema b/gosa-plugins/goto/contrib/goserver.schema index 50b24879f..e2a52e251 100644 --- a/gosa-plugins/goto/contrib/goserver.schema +++ b/gosa-plugins/goto/contrib/goserver.schema @@ -115,6 +115,12 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.9.23 NAME 'goFaxPassword' 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.83 NAME 'gosaLogDB' + DESC 'GOsa logging DB name' + 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.24 NAME 'goLogAdmin' DESC 'Admin principal for log server' EQUALITY caseExactIA5Match @@ -529,7 +535,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 $ goLogAdmin $ goLogPassword ) + MUST ( cn $ gosaLogDB $ goLogAdmin $ goLogPassword ) MAY ( goLogDBServerStatus )) # Fon Server description -- 2.30.2
{t}Logging DB user{/t}{$must}{t}Database{/t}{$must} -{render acl=$goLogAdminACL} - +{render acl=$goLogDBACL} + {/render}
{t}Database{/t}{$must}{t}Logging DB user{/t}{$must} -{render acl=$goLogDBACL} - +{render acl=$goLogAdminACL} + {/render}