Udpated setup to support an option for FAI release management

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 47816a8d6c9b3efd3c88eaa2bc65b283aa98a794..3dba2dced5f6d06bde0ca099dfcff38320b0c182 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -61,10 +61,16 @@
                        <!-- Use 'lock_dn'      for dn
                      'lock_name'    for name
                      'lock_type'    for branch/freeze -->
+
+{if $cv.enableFAI_management}
+                       <plugin acl="FAIclass" class="faiManagement" icon="fai.png" 
+                               path="plugins/admin/fai" />
+{else}
+<!--
                        <plugin acl="FAIclass" class="faiManagement" icon="fai.png" 
-                               postcreate="" 
-                postremove="" 
                                path="plugins/admin/fai" />
+-->
+{/if}
                        <plugin acl="blocklists" class="blocklist" icon="blocklists.png"
                                path="plugins/gofax/blocklists" />
                        <plugin acl="goFonMacro" class="gofonMacro" icon="macros.png"
@@ -163,7 +169,11 @@
                <tab class="servgeneric" name="Generic" />
                <tab class="workstartup" name="Startup" />
                <tab class="serverService" name="Services" />
-               <tab class="faiSummaryTab" name="FAI summary" />
+{if $cv.enableFAI_management}
+           <tab class="faiSummaryTab" name="FAI summary" />
+{else}
+<!--    <tab class="faiSummaryTab" name="FAI summary" /> -->
+{/if}
                <tab class="terminfo" name="Information" />
                <tab class="glpiAccount" name="Inventory" />
        </servtabs>
@@ -174,7 +184,11 @@
                <tab class="workservice" name="Devices" />
                <tab class="printgeneric" name="Printer" />
                <tab class="terminfo" name="Information" />
-               <tab class="faiSummaryTab" name="FAI summary" />
+{if $cv.enableFAI_management}
+           <tab class="faiSummaryTab" name="FAI summary" />
+{else}
+<!--    <tab class="faiSummaryTab" name="FAI summary" /> -->
+{/if}
                <tab class="glpiAccount" name="Inventory" />
        </worktabs>
 
@@ -255,6 +269,7 @@
                <tab class="csvimport" name="CSV Import" />
        </ldiftab>
 
+{if $cv.enableFAI_management}
        <faipartitiontabs>
                <tab class="faiPartitionTable" name="Partitions" />
        </faipartitiontabs>
@@ -283,6 +298,38 @@
        <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}
        
        <main default="{$cv.location}"
 

diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index 6dca19771618fe0b7a997b4bf08f480f6a0ab27b..e42e5e03298a4d5040cd1af3f1a572d69abf49e4 100644 (file)
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -47,10 +47,11 @@ class Step_Config2 extends setup_step
                                   "smbhash"          => 'SMBHASH',
                                   "samba_rid_active" => FALSE); 
 
-  var $sambaDomain_found = FALSE;
-  var $use_netatalk = FALSE;
+  var $sambaDomain_found    = FALSE;
+  var $use_netatalk         = FALSE;
+  var $enableFAI_management = FALSE;
 
-  var $attributes = array("governmentmode","sambaidmapping","cyrusunixstyle","mail","use_netatalk");
+  var $attributes = array("governmentmode","sambaidmapping","cyrusunixstyle","mail","use_netatalk","enableFAI_management");
   var $called = FALSE;
 
   function Step_Config2()
@@ -111,6 +112,12 @@ class Step_Config2 extends setup_step
       if(is_array($tmp) && isset($tmp['apple-user'])) {
         $this->use_netatalk = TRUE;
       }
+
+      /* Check the FAI schema is used */
+      if(is_array($tmp) && isset($tmp['FAIclass'])){
+#        $this->enableFAI_management = TRUE;
+      }
+
       $this->called = TRUE;
     }
 

diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index af924b8b5c3979f6c6b6bf21785d4ed702812c41..5189d7c509a95ceb1ee915aafd2da8b49a406723 100644 (file)
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -81,6 +81,18 @@
         </div>
     </div>
 
+       <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Enable FAI release management{/t}
+        </div>
+        <div class='step4_value'>
+
+            <select name="enableFAI_management" size="1" title="">
+                {html_options options=$bool selected=$enableFAI_management}
+            </select>
+        </div>
+    </div>
+
        <div class='step4_container'>
         <div class='step4_name'>
             {t}Enable user netatalk plugin{/t}