From 026e13bc010e15f779eb996c0f37567c6c2b940a Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 25 Jun 2009 07:53:46 +0000 Subject: [PATCH] Updated setup to allow gosa-si settings. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13793 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/contrib/gosa.conf | 7 +++++ gosa-core/setup/class_setupStep_Config3.inc | 14 +++++++++ gosa-core/setup/setup_config3.tpl | 35 +++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf index d09bf2ed7..a5c03e542 100644 --- a/gosa-core/contrib/gosa.conf +++ b/gosa-core/contrib/gosa.conf @@ -457,6 +457,13 @@ {if $cv.optional.sudoou_active} 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} loginAttribute="{$cv.optional.login_attribute}" {else} diff --git a/gosa-core/setup/class_setupStep_Config3.inc b/gosa-core/setup/class_setupStep_Config3.inc index 41da0586d..1592df838 100644 --- a/gosa-core/setup/class_setupStep_Config3.inc +++ b/gosa-core/setup/class_setupStep_Config3.inc @@ -53,6 +53,10 @@ class Step_Config3 extends setup_step "notifydir" => "", "notifydir_active" => FALSE, + "gosaSupportURI" => "gosa-si-secret@server:20081", + "gosaSupportTimeout" => 15, + "gosaSupportURI_active" => FALSE, + "uniq_identifier" => "entryCSN", "uniq_identifier_active" => TRUE, @@ -171,6 +175,16 @@ class Step_Config3 extends setup_step $this->optional['notifydir_active'] = FALSE; } + if(isset($_POST['gosaSupportURI_active'])){ + $this->optional['gosaSupportURI_active'] = TRUE; + if(isset($_POST['gosaSupportURI'])){ + $this->optional['gosaSupportURI'] = get_post('gosaSupportURI'); + $this->optional['gosaSupportTimeout'] = get_post('gosaSupportTimeout'); + } + }else{ + $this->optional['gosaSupportURI_active'] = FALSE; + } + if(isset($_POST['uniq_identifier_active'])){ $this->optional['uniq_identifier_active'] = TRUE; if(isset($_POST['uniq_identifier'])){ diff --git a/gosa-core/setup/setup_config3.tpl b/gosa-core/setup/setup_config3.tpl index bfcaac07f..1dfa10d27 100644 --- a/gosa-core/setup/setup_config3.tpl +++ b/gosa-core/setup/setup_config3.tpl @@ -169,6 +169,41 @@ +
+
+ {t}Gosa support daemon{/t} +
+
+ {if $optional.gosaSupportURI_active == FALSE} + + + {else} + + + {/if} +
+
+ +
+
+ {t}Daemon timeout{/t} +
+
+ {if $optional.gosaSupportURI_active == FALSE} + + {else} + + {/if} +
+
+ +

{t}Login and session{/t}

-- 2.30.2