Updated setup

-Removed gotomasses
-Added sudoou override

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

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index c73eb3b23062b4b30a787e5b28d53358d45b4449..a16b8598d0b77cb8494a362a84141a33e3ded91d 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -100,15 +100,8 @@
                                path="plugins/addons/mailqueue" />
                        <plugin acl="ldapmanager" class="ldif" icon="ldif.png"
                                path="plugins/addons/ldapmanager" />
-{if $cv.optional.gotomasses_active}
-                       <plugin acl="gotomasses" class="gotomasses" icon="system.png"
-                               path="plugins/addons/goto" />
-{else}
-<!--
                        <plugin acl="gotomasses" class="gotomasses" icon="system.png"
                                path="plugins/addons/gotomasses" />
--->
-{/if}
 <!--
                        <plugin acl="all" class="bugsubmitter" icon="bugsubmitter.png"
                                path="plugins/addons/bugsubmitter" />
@@ -472,6 +465,9 @@
                        groups="{$cv.groupou}"
                        gidbase="{$cv.uidbase}"
                        uidbase="{$cv.uidbase}"
+{if $cv.optional.sudoou_active}
+                       sudoou="{$cv.optional.sudoou}"
+{/if}
 {if $cv.optional.login_attribute}
                        login_attribute="{$cv.optional.login_attribute}"
 {else}

diff --git a/gosa-core/setup/class_setupStep_Config3.inc b/gosa-core/setup/class_setupStep_Config3.inc
index d47ba7752f03a8a021f6fec0fec465aac32cfb00..cd62785e3b9c751505cbdb0797a924b07612a27e 100644 (file)
--- a/gosa-core/setup/class_setupStep_Config3.inc
+++ b/gosa-core/setup/class_setupStep_Config3.inc
@@ -59,8 +59,8 @@ class Step_Config3 extends setup_step
               "kioskpath" => "/var/spool/kiosk",
               "kioskpath_active" => FALSE,
 
-              "gotomasses_file"   => "/etc/gosa/gotomasses",
-              "gotomasses_active" => FALSE,
+              "sudoou"   => "ou=sudoers,%BASE%",
+              "sudoou_active" => FALSE,
 
               "noprimarygroup"  => FALSE);
 
@@ -82,10 +82,15 @@ class Step_Config3 extends setup_step
 
   function execute()
   {
+
+    $cv = $this->parent->captured_values;
+    $this->optional['sudoou'] = preg_replace("/%BASE%/",$cv['base'],$this->optional['sudoou']);
     $smarty = get_smarty();
     $smarty->assign("bool",array(FALSE => _("No"), TRUE => _("Yes")));
     $smarty->assign("uniq_identifiers",array( "entryCNS" => "entryCSN",
                                               "contextCSN"=>"contextCSN" ));
+
+    
     $smarty->assign("optional", $this->optional);
     foreach($this->attributes as $attr){
       $smarty->assign($attr,$this->$attr);
@@ -148,13 +153,13 @@ class Step_Config3 extends setup_step
         $this->optional['kioskpath_active'] = FALSE;
       }
 
-      if(isset($_POST['gotomasses_active'])){
-        $this->optional['gotomasses_active'] = TRUE;
-        if(isset($_POST['gotomasses_file'])){
-          $this->optional['gotomasses_file'] = get_post('gotomasses_file');
+      if(isset($_POST['sudoou_active'])){
+        $this->optional['sudoou_active'] = TRUE;
+        if(isset($_POST['sudoou'])){
+          $this->optional['sudoou'] = get_post('sudoou');
         }
       }else{
-        $this->optional['gotomasses_active'] = FALSE;
+        $this->optional['sudoou_active'] = FALSE;
       }
 
       if(isset($_POST['notifydir_active'])){

diff --git a/gosa-core/setup/setup_config3.tpl b/gosa-core/setup/setup_config3.tpl
index 012915a342725ce088a0e82f48c33bd38427b8ae..7f66fe8b532bdcd37b8c205c2f8f79de6f3d6637 100644 (file)
--- a/gosa-core/setup/setup_config3.tpl
+++ b/gosa-core/setup/setup_config3.tpl
@@ -93,19 +93,19 @@
 
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Enable system deployment{/t}
+            {t}Override sudo role ou{/t}
         </div>
         <div class='step4_value'>
-            {if $optional.gotomasses_active == FALSE}
-                <input type='checkbox' value='1' name='gotomasses_active'
-                    onClick='changeState("gotomasses_file");'>
-                <input size=40 id='gotomasses_file' name='gotomasses_file' 
-                                       type='text' value='{$optional.gotomasses_file}' disabled>
+            {if $optional.sudoou_active == FALSE}
+                <input type='checkbox' value='1' name='sudoou_active'
+                    onClick='changeState("sudoou");'>
+                <input size=40 id='sudoou' name='sudoou' 
+                                       type='text' value='{$optional.sudoou}' disabled>
             {else}
-                <input type='checkbox' value='1' name='gotomasses_active' checked
-                                       onClick='changeState("gotomasses_file");'>
-                <input size=40 id='gotomasses_file' name='gotomasses_file' 
-                                       type='text' value='{$optional.gotomasses_file}'  >
+                <input type='checkbox' value='1' name='sudoou_active' checked
+                                       onClick='changeState("sudoou");'>
+                <input size=40 id='sudoou' name='sudoou' 
+                                       type='text' value='{$optional.sudoou}'  >
             {/if}
         </div>
     </div>