From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 3 Apr 2008 14:42:40 +0000 (+0000)
Subject: Updated setup
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aee4003e15f93513b24b2be0fc6352716249054d;p=gosa.git

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 c73eb3b23..a16b8598d 100644
--- 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 d47ba7752..cd62785e3 100644
--- 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 012915a34..7f66fe8b5 100644
--- 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>