X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fcontrib%2Fgosa.conf;h=e3d5f06be9018240d65d647d9095e563786a277d;hb=2bcc194f7b80c111f92d82dd4a58085743a3e44f;hp=8a968d204e442940622f114d2091ca61a4bea950;hpb=578c6e5d2d7d0cfe846a78777f0e7893a93237cf;p=gosa.git

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 8a968d204..e3d5f06be 100644
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -1,5 +1,5 @@
 {literal}<?xml version="1.0"?>{/literal}
-<conf config_version="{$config_checksum}" >
+<conf configVersion="{$config_checksum}" >
 
   <!-- GOsa menu definition **************************************************
 
@@ -27,7 +27,7 @@
        You can override an icon by specifying the "icon" attribute.
 
        For more information about possible configuration parameters, please take
-       a look at the gosa.conf manual page.
+       a look at the gosa.conf(5) manual page.
    -->
   <menu>
 
@@ -35,14 +35,10 @@
     <section name="My account">
       <plugin acl="users/user:self" class="user" />
       <plugin acl="users/posixAccount:self"  class="posixAccount" />
-      <plugin acl="users/environment:self" class="environment" {if $cv.optional.kioskpath_active} kioskpath="{$cv.optional.kioskpath}"{/if} />
+      <plugin acl="users/environment:self" class="environment" {if $cv.optional.kioskpath_active} kioskPath="{$cv.optional.kioskpath}"{/if} />
       <plugin acl="users/mailAccount:self" class="mailAccount" />
       <plugin acl="users/sambaAccount:self" class="sambaAccount" />
-{if $cv.use_netatalk}
       <plugin acl="users/netatalk:self" class="netatalk" />
-{else}
-      <!--  <plugin acl="users/netatalk:self" class="netatalk" />  -->
-{/if}
       <plugin acl="users/connectivity:self" class="connectivity" />
       <plugin acl="users/gofaxAccount:self" class="gofaxAccount" />
       <plugin acl="users/phoneAccount:self" class="phoneAccount" />
@@ -56,23 +52,16 @@
       <plugin acl="department" class="departmentManagement" />
       <plugin acl="users" class="userManagement" />
       <plugin acl="groups" class="groupManagement" />
+      <plugin acl="roles" class="roleManagement"/>
       <plugin acl="ogroups" class="ogroupManagement" />
       <plugin acl="application" class="applicationManagement" />
-{if $cv.enableMimeType}
       <plugin acl="mimetypes" class="mimetypeManagement" />
-{else}
-      <!--  <plugin acl="mimetypes"  class="mimetypeManagement" /> -->
-{/if}
       <plugin acl="devices" class="deviceManagement" />
-      <plugin acl="terminal/termgeneric,workstation/workgeneric,server/servgeneric,phone/phoneGeneric,printer/printgeneric,component/componentGeneric,winworkstation/wingeneric" class="systems" />
-      <!-- Use 'lock_dn'      for dn
-        'lock_name'    for name
-        'lock_type'    for branch/freeze -->
-{if $cv.enableFAI_management}
-      <plugin acl="fai/faiScript,fai/faiHook,fai/faiTemplate,fai/faiVariable,fai/faiPartitionTable,fai/faiPackage,fai/faiProfile" class="faiManagement" />
-{else}
-      <!--  <plugin acl="fai/faiScript,fai/faiHook,fai/faiTemplate,fai/faiVariable,fai/faiPartitionTable,fai/faiPackage,fai/faiProfile" class="faiManagement" /> -->
-{/if}
+      <plugin acl="terminal/termgeneric,workstation/workgeneric,server/servgeneric,phone/phoneGeneric,printer/printgeneric,component/componentGeneric,winworkstation/wingeneric,opsi/opsiGeneric" class="systems" />
+      <!-- Use 'lockDn'      for dn
+               'lockName'    for name
+               'lockType'    for branch/freeze -->
+      <plugin acl="fai/faiScript,fai/faiHook,fai/faiTemplate,fai/faiVariable,fai/faiPartitionTable,fai/faiPackage,fai/faiProfile,fai/faiManagement,opsi/opsiProperties" class="faiManagement" />
       <plugin acl="gofaxlist" class="blocklist" />
       <plugin acl="gofonmacro" class="goFonMacro" />
       <plugin acl="gofonconference" class="phoneConferenceManagment" />
@@ -85,8 +74,8 @@
     <!--  <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" class="faxreport" />
-      <plugin acl="fonreport" class="fonreport" />
+      <plugin acl="faxreport/faxreport:self,faxreport" class="faxreport" />
+      <plugin acl="fonreport/fonreport:self,fonreport" class="fonreport" />
       <plugin acl="logview"  class="logview" />
       <plugin acl="gotomasses" class="gotomasses" />
       <plugin acl="ldapmanager" class="ldif" />
@@ -119,7 +108,7 @@
      <tab class="environment" name="Environment" />
      <tab class="mailAccount" name="Mail" />
      <tab class="sambaAccount" name="Samba" />
-{if $cv.use_netatalk}     <tab class="netatalk" name="Netatalk" /> {else}<!-- <tab class="netatalk" name="Netatalk" /> --> {/if}
+     <tab class="netatalk" name="Netatalk" />
      <tab class="connectivity" name="Connectivity" />
      <tab class="gofaxAccount" name="Fax" />
      <tab class="phoneAccount" name="Phone" />
@@ -183,8 +172,7 @@
      <tab class="termgeneric" name="Generic" />
      <tab class="termstartup" name="Startup" />
      <tab class="termservice" name="Devices" />
-     <tab class="printgeneric" name="Printer" />
-     <tab class="terminfo" name="Information" snmpcommunity="{$cv.optional.snmpcommunity}" />
+     <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
      <!--<tab class="glpiAccount" name="Inventory" /> -->
   </termtabs>
 
@@ -192,14 +180,9 @@
      <tab class="servgeneric" name="Generic" />
      <tab class="workstartup" name="Startup" />
      <tab class="ServerService" name="Services" />
-{if $cv.enableFAI_management}
      <tab class="faiSummaryTab" name="Deployment summary" />
-     <tab class="goto_log_view" name="Installation logs" />
-{else}
-     <!-- <tab class="faiSummaryTab" name="Deployment summary" /> -->
-     <!-- <tab class="goto_log_view" name="Installation logs" /> -->
-{/if}
-     <tab class="terminfo" name="Information" snmpcommunity="{$cv.optional.snmpcommunity}" />
+     <tab class="gotoLogView" name="Installation logs" />
+     <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
      <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </servtabs>
 
@@ -208,14 +191,9 @@
      <tab class="workstartup" name="Startup" />
      <tab class="workservice" name="Devices" />
      <tab class="printgeneric" name="Printer" />
-     <tab class="terminfo" name="Information" snmpcommunity="{$cv.optional.snmpcommunity}" />
-{if $cv.enableFAI_management}
+     <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
      <tab class="faiSummaryTab" name="Deployment summary" />
-     <tab class="goto_log_view" name="Installation logs" />
-{else}
-     <!-- <tab class="faiSummaryTab" name="Deployment summary" /> -->
-     <!-- <tab class="goto_log_view" name="Installation logs" /> -->
-{/if}
+     <tab class="gotoLogView" name="Installation logs" />
      <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </worktabs>
 
@@ -253,12 +231,10 @@
     <tab class="goTerminalServer" />
     <tab class="goLdapServer" />
     <tab class="goShareServer" />
-{if $cv.generic_settings.enableDHCP}
+    <tab class="gospamserver" />
+    <tab class="govirusserver" />
     <tab class="servdhcp" />
-{/if}
-{if $cv.generic_settings.enableDNS}
     <tab class="servdns" />
-{/if}
     <tab class="gosaLogServer" />
   </serverservice>
 
@@ -283,6 +259,11 @@
     <tab class="dcObject" name="Generic" />
   </dcobject_tabs>
 
+  <!-- Role tabs -->
+  <roletabs>
+    <tab class="roleGeneric" name="Generic"/>
+  </roletabs>
+
   <ogrouptabs>
     <tab class="ogroup" name="Generic" />
   </ogrouptabs>
@@ -299,7 +280,11 @@
   <!-- Connectivity plugins -->
   <connectivity>
 {if $cv.mail == "kolab"}
-    <tab class='kolabAccount' /> 
+    <tab class='kolabAccount' />
+{else}
+<!--
+    <tab class='kolabAccount' />
+-->
 {/if}
     <tab class="proxyAccount" />
     <tab class="pureftpdAccount" />
@@ -311,11 +296,11 @@
       username="OGo"
       password=""
       database="OGo"
-      datahost="localhost" />
+      databaseServer="localhost" />
     -->
     <tab class="pptpAccount" /> 
     <tab class="phpscheduleitAccount" /> 
-        <tab class="oxchangeAccount" />
+    <tab class="oxchangeAccount" />
   </connectivity>
 
   <ldiftab>
@@ -325,8 +310,6 @@
     <tab class="csvimport" name="CSV Import" />
   </ldiftab>
 
-  <!-- FAI plugins -->
-{if $cv.enableFAI_management}
   <faipartitiontabs>
     <tab class="faiPartitionTable" name="Partitions" />
   </faipartitiontabs>
@@ -355,39 +338,16 @@
   <faipackagetabs>
     <tab class="faiPackage" name="Packages" />
   </faipackagetabs>
-{else}
-  <!-- 
-  <faipartitiontabs>
-    <tab class="faiPartitionTable" name="Partitions" />
-  </faipartitiontabs>
-
-  <faiscripttabs>
-    <tab class="faiScript" name="Script" />
-  </faiscripttabs>
-
-  <faihooktabs>
-    <tab class="faiHook" name="Hooks" />
-  </faihooktabs>
-
-  <faivariabletabs>
-    <tab class="faiVariable" name="Variables" />
-  </faivariabletabs>
-
-  <faitemplatetabs>
-    <tab class="faiTemplate" name="Templates" />
-  </faitemplatetabs>
-
-  <faiprofiletabs>
-    <tab class="faiProfile" name="Profiles" />
-    <tab class="faiSummaryTab" name="Summary" />
-  </faiprofiletabs>
 
-  <faipackagetabs>
-    <tab class="faiPackage" name="Packages" />
-  </faipackagetabs>
-  -->
-{/if}
+  <opsitabs>
+    <tab class="opsiGeneric" name="Opsi" />
+    <tab class="opsiSoftware" name="Hardware information" />
+    <tab class="opsiHardware" name="software information" />
+  </opsitabs>
 
+  <opsiprodconfig>
+    <tab class="opsiProperties" name="Config" />
+  </opsiprodconfig>
 
   <!-- Logging plugin -->
   <logtabs>
@@ -402,124 +362,131 @@
        each location definition inside.
 
        For more information about the configuration parameters, take a look at
-       the gosa.conf manual page.
+       the gosa.conf(5) manual page.
 
   -->
   <main default="{$cv.location}"
 {if $cv.optional.list_summary}
-        list_summary="true"
+        listSummary="true"
 {else}
-        list_summary="false"
+        listSummary="false"
 {/if}
 {if $cv.pwd_rules.pwminlen_active}
-        pwminlen="{$cv.pwd_rules.pwminlen}"
+        passwordMinLength="{$cv.pwd_rules.pwminlen}"
 {/if}
 {if $cv.pwd_rules.pwdiffer_active}
-        pwdiffer="{$cv.pwd_rules.pwdiffer}"
+        passwordMinDiffer="{$cv.pwd_rules.pwdiffer}"
 {/if}
 {if $cv.pwd_rules.externalpwdhook_active}
-        externalpwdhook="{$cv.pwd_rules.externalpwdhook}"
+        passwordHook="{$cv.pwd_rules.externalpwdhook}"
 {/if}
 {if $cv.errorlvl}
-        displayerrors="true"
+        displayErrors="true"
 {else}
-        displayerrors="false"
+        displayErrors="false"
 {/if}
 {if $cv.enable_schema_check}
-        schema_check="true"
+        schemaCheck="true"
 {else}
-        schema_check="false"
+        schemaCheck="false"
 {/if}
 {if $cv.generic_settings.enableCopyPaste}
-        enableCopyPaste="true"
+        copyPaste="true"
 {else}
-        enableCopyPaste="false"
+        copyPaste="false"
 {/if}
 {if $cv.optional.forceglobals}
-        forceglobals="true"
+        forceGlobals="true"
 {else}
-        forceglobals="false"
+        forceGlobals="false"
 {/if}
 {if $cv.optional.forcessl}
-        forcessl="true"
+        forceSSL="true"
 {else}
-        forcessl="false"
+        forceSSL="false"
 {/if}
 {if $cv.optional.ldapstats}
-        ldapstats="true"
+        ldapStats="true"
 {else}
-        ldapstats="false"
+        ldapStats="false"
 {/if}
 {if $cv.optional.warnssl}
-        warnssl="true"
+        warnSSL="true"
 {else}
-        warnssl="false"
+        warnSSL="false"
 {/if}
 {if $cv.optional.ppd_path_active}
-       ppd_path="{$cv.optional.ppd_path}"
+        ppdGzip="true"
+        ppdPath="{$cv.optional.ppd_path}"
 {/if}
 {if $cv.optional.max_ldap_query_time_active}  
-       max_ldap_query_time="{$cv.optional.max_ldap_query_time}"
+        ldapMaxQueryTime="{$cv.optional.max_ldap_query_time}"
 {/if}
 {if $cv.optional.noprimarygroup}
-       noprimarygroup="true"
+        primaryGroupFilter="true"
 {/if}
 {if $cv.optional.mailQueueScriptPath_active}
-       mailQueueScriptPath="{$cv.optional.mailQueueScriptPath}"
+        mailQueueScriptPath="{$cv.optional.mailQueueScriptPath}"
 {/if}
 {if $cv.optional.user_filter_cookie}
-       save_filter="true"
+        storeFilterSettings="true"
 {else}
-       save_filter="false"
+        storeFilterSettings="false"
 {/if}
 {if $cv.compressed}
-       compressed="true"
+        sendCompressedOutput="true"
 {else}
-       compressed="false"
+        sendCompressedOutput="false"
 {/if}
 {if $cv.optional.uniq_identifier_active }
-       uniq_identifier="{$cv.optional.uniq_identifier}"
+        modificationDetectionAttribute="{$cv.optional.uniq_identifier}"
 {else}
-       uniq_identifier=""
-{/if}
-       lang="{$cv.lang_selected}"
-       theme="{$cv.theme}"
-       session_lifetime="{$cv.optional.session_lifetime}"
-       compile="{$cv.optional.compile}"
-       debuglevel="{$cv.optional.debuglevel}"
-       smbhash='{$cv.samba_settings.smbhash}'
+        modificationDetectionAttribute=""
+{/if}
+        language="{$cv.lang_selected}"
+        theme="{$cv.theme}"
+        sessionLifetime="{$cv.optional.session_lifetime}"
+        templateCompileDirectory="{$cv.optional.compile}"
+        debugLevel="{$cv.optional.debuglevel}"
+        sambaHashHook='{$cv.samba_settings.smbhash}'
     >
 
     <!-- Location definition -->
     <location name="{$cv.location}"
-              hash="{$cv.encryption}"
-              dnmode="{$cv.peopledn}"
-              server="{$cv.connection}"
-              people="{$cv.peopleou}"
-              groups="{$cv.groupou}"
-              gidbase="{$cv.uidbase}"
-              uidbase="{$cv.uidbase}"
+              passwordDefaultHash="{$cv.encryption}"
+              accountPrimaryAttribute="{$cv.peopledn}"
+              userRDN="{$cv.peopleou}"
+              groupRDN="{$cv.groupou}"
+              gidNumberBase="{$cv.uidbase}"
+              uidNumberBase="{$cv.uidbase}"
               logging="{$cv.generic_settings.logging}"
 {if $cv.optional.sudoou_active}
-              sudoou="{$cv.optional.sudoou}"
+              sudoRDN="{$cv.optional.sudoou}"
+{/if}
+{if $cv.optional.gosaSupportURI_active}
+              gosaSupportURI="{$cv.optional.gosaSupportURI}"
+              gosaSupportTimeout="{$cv.optional.gosaSupportTimeout}"
+{else}
+              disabled_gosaSupportURI="gosa-si-secret@server:20081}"
+              disabled_gosaSupportTimeout="15"
 {/if}
 {if $cv.optional.login_attribute}
-              login_attribute="{$cv.optional.login_attribute}"
+              loginAttribute="{$cv.optional.login_attribute}"
 {else}
-              login_attribute="uid"
+              loginAttribute="uid"
 {/if}
 {if $cv.timezone}
               timezone="{$cv.timezone}"
 {/if}
 {if $cv.optional.strict_units}
-              strict_units="true"
+              honourUnitTags="true"
 {else}
-              strict_units="false"
+              honourUnitTags="false"
 {/if}
 {if $cv.krbsasl}
-              krbsasl="true"
+              useSaslForKerberos="true"
 {else}
-              krbsasl="false"
+              useSaslForKerberos="false"
 {/if}
 {if $cv.rfc2307bis}
               rfc2307bis="true"
@@ -527,82 +494,88 @@
               rfc2307bis="false"
 {/if}
 {if $cv.include_personal_title}
-              include_personal_title="true"
+              personalTitleInDN="true"
 {else}
-              include_personal_title="false"
+              personalTitleInDN="false"
 {/if}
 {if $cv.base_hook_active}
-              base_hook="{$cv.base_hook}"
+              nextIdHook="{$cv.base_hook}"
 {/if}
 {if $cv.generic_settings.wws_ou_active}
-              winstations="{$cv.generic_settings.wws_ou}"
+              sambaMachineAccountRDN="{$cv.generic_settings.wws_ou}"
 {/if}
 {if $cv.id_settings.idgen_active}
-              idgen="{$cv.id_settings.idgen}"
+              idGenerator="{$cv.id_settings.idgen}"
 {/if}
 {if $cv.strict}
-              strict="yes"
+              strictNamingRules="true"
 {else}
-              strict="no"
+              strictNamingRules="false"
 {/if}
 {if $cv.id_settings.minid_active}
-              minid="{$cv.id_settings.minid}"
+              minId="{$cv.id_settings.minid}"
 {/if}
+              mailAttribute="{$cv.mail_attrib}"
+              gosaSharedPrefix=""
+              mailUserCreation=""
+              mailFolderCreation=""
+              imapTimeout="10"
 {if $cv.mail != "disabled"}
               mailMethod="{$cv.mail}"
 {if $cv.cyrusunixstyle}
-              cyrusunixstyle="true"
+              cyrusUseSlashes="true"
 {else}
-              cyrusunixstyle="false"
+              cyrusUseSlashes="false"
 {/if}
-              mail_uattrib="{$cv.mail_attrib}"
 {if $cv.mail_settings.vacationdir_active}
-              vacationdir="{$cv.mail_settings.vacationdir}"
+              vacationTemplateDirectory="{$cv.mail_settings.vacationdir}"
 {/if}
 {/if}
 {if $cv.tls}
-              tls="true"
+              ldapTLS="true"
 {/if}
 {if $cv.governmentmode}
-              governmentmode="true"
+              honourIvbbAttributes="true"
 {else}
-              governmentmode="false"
+              honourIvbbAttributes="false"
 {/if}
 {if $cv.sambaidmapping}
-              sambaidmapping="true"
+              sambaIdMapping="true"
 {/if}
 {if $cv.account_expiration}
-              account_expiration="true"
+              handleExpiredAccounts="true"
 {/if}
 {if $cv.samba_settings.samba_sid_active}
-              SID="{$cv.samba_settings.samba_sid}"
+              sambaSID="{$cv.samba_settings.samba_sid}"
 {/if}
 {if $cv.samba_settings.samba_rid_active}
-              RIDBASE="{$cv.samba_settings.samba_rid_active}"
+              sambaRidBase="{$cv.samba_settings.samba_rid_active}"
 {/if}
 {if $cv.generic_settings.snapshot_active}  
-              enable_snapshot="true"
+              enableSnapshots="true"
 {if $cv.generic_settings.snapshot_base != ""}
-              snapshot_base="{$cv.generic_settings.snapshot_base}"
+              snapshotBase="{$cv.generic_settings.snapshot_base}"
 {/if}
 {if $cv.generic_settings.snapshot_user != ""}
-              snapshot_user="{$cv.generic_settings.snapshot_user}"
+              snapshotAdminDn="{$cv.generic_settings.snapshot_user}"
 {/if}
 {if $cv.generic_settings.snapshot_password != ""}
-              snapshot_password="{$cv.generic_settings.snapshot_password}"
+              snapshotAdminPassword="{$cv.generic_settings.snapshot_password}"
 {/if}
 {if $cv.generic_settings.snapshot_server != ""}
-              snapshot_server="{$cv.generic_settings.snapshot_server}"
+              snapshotURI="{$cv.generic_settings.snapshot_server}"
 {/if}
 {/if}
 {if $cv.samba_version != 0}
-              sambaversion="{$cv.samba_version}"
+              sambaVersion="{$cv.samba_version}"
+{else}
+              sambaVersion="3"
 {/if}
               config="ou=gosa,ou=configs,ou=systems,{$cv.base}">
 
-              <referral url="{$cv.connection}/{$cv.base}"
-                       admin="{$cv.admin}"
-                       password="{$cv.password}" />
+              <referral URI="{$cv.connection}/{$cv.base}"
+                        adminDn="{$cv.admin}"
+                        adminPassword="{$cv.password}" />
 
     </location>
   </main>