From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 29 Mar 2010 08:22:22 +0000 (+0000)
Subject: Dropped addressbook and glpi stuff.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=10a62f8dee37e77ec7ef60ab6d963122748ffe0a;p=gosa.git

Dropped addressbook and glpi stuff.


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

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index a57f6c5c3..37eef2b61 100644
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -74,7 +74,6 @@
     <section name="Addons">
       <plugin acl="server/rSyslogServer" class="rsyslog" />
     <!--  <plugin acl="server/servservrepository,server/dakrepository,server/dakkeyring,server/dakqueue" class="dak_tabs" path="plugins/addons/dak" /> -->
-      <plugin acl="addressbook" class="addressbook" />
       <plugin acl="mailqueue" class="mailqueue" />
       <plugin acl="faxreport/faxreport:self,faxreport" class="faxreport" />
       <plugin acl="fonreport/fonreport:self,fonreport" class="fonreport" />
@@ -157,7 +156,6 @@
 
   <phonetabs>
     <tab class="phoneGeneric" name="Generic" />
-    <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </phonetabs>
 
   <!-- GOto plugins -->
@@ -183,7 +181,6 @@
      <tab class="termstartup" name="Startup" />
      <tab class="termservice" name="Devices" />
      <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
-     <!--<tab class="glpiAccount" name="Inventory" /> -->
   </termtabs>
 
   <servtabs>
@@ -193,7 +190,6 @@
      <tab class="faiSummaryTab" name="Deployment summary" />
      <tab class="gotoLogView" name="Installation logs" />
      <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
-     <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </servtabs>
 
   <worktabs>
@@ -204,22 +200,18 @@
      <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
      <tab class="faiSummaryTab" name="Deployment summary" />
      <tab class="gotoLogView" name="Installation logs" />
-     <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </worktabs>
 
   <printtabs>
      <tab class="printgeneric" name="Generic" />
-     <!-- <tab class="glpiPrinterAccount" name="Inventory" /> -->
   </printtabs>
 
   <componenttabs>
      <tab class="componentGeneric" name="Generic" />
-     <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </componenttabs>
 
   <wintabs>
      <tab class="wingeneric" name="Generic" />
-     <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </wintabs>
 
   <serverservice>
@@ -235,7 +227,6 @@
     <tab class="goKrbServer" />
     <tab class="goFaxServer" />
     <tab class="goFonServer" />
-    <tab class="goGlpiServer" />
     <tab class="goCupsServer" />
     <tab class="goKioskService" />
     <tab class="goTerminalServer" />