Updated schema and classes. Closes #378.

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

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 30b970bc6970a15be9840aa3a14c4b6264baa509..69a05f2ba02ad65e5f24e79b600cf526845e21a5 100644 (file)
--- 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 b372fe64d0ac7edc8fa00fd5f37f291e81b29746..51a4393b81e08cae50ff69e8db13448df2e259d5 100644 (file)
--- a/gosa-plugins/goto/admin/systems/services/syslog/goLogDBServer.tpl
+++ b/gosa-plugins/goto/admin/systems/services/syslog/goLogDBServer.tpl
@@ -1,18 +1,18 @@
 <h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}Logging database information{/t}</h2>
 <table summary="">
     <tr>
-     <td>{t}Logging DB user{/t}{$must}</td>
+     <td>{t}Database{/t}{$must}</td>
      <td>
-{render acl=$goLogAdminACL}
-       <input name="goLogAdmin" id="goLogAdmin" size=30 maxlength=60 value="{$goLogAdmin}">
+{render acl=$goLogDBACL}
+       <input type="text" name="gosaLogDB" id="goLogDB" size=30 maxlength=60 value="{$gosaLogDB}">
 {/render}
      </td>
     </tr>
     <tr>
-     <td>{t}Database{/t}{$must}</td>
+     <td>{t}Logging DB user{/t}{$must}</td>
      <td>
-{render acl=$goLogDBACL}
-       <input type="text" name="goLogDB" id="goLogDB" size=30 maxlength=60 value="{$goLogDB}">
+{render acl=$goLogAdminACL}
+       <input name="goLogAdmin" id="goLogAdmin" size=30 maxlength=60 value="{$goLogAdmin}">
 {/render}
      </td>
     </tr>

diff --git a/gosa-plugins/goto/contrib/goserver.ldif b/gosa-plugins/goto/contrib/goserver.ldif
index 9c5f185e64c4011cfa1d5b3e6fcd93260222c4e8..b655c6ed33991cfef5f1d8327b18085890026b17 100644 (file)
--- 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 50b24879fdcb39ec9bf3a8cde2d2794265d71d02..e2a52e2513afaf47cebd140337b7756040cc7f43 100644 (file)
--- 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