From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 26 Jun 2009 06:22:24 +0000 (+0000)
Subject: Updated setup.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b5f2044730417ff5862c1153694854efc26464c0;p=gosa.git

Updated setup.
-If php was compiles without posix functions, then the setup wasn't working.


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

diff --git a/gosa-core/setup/class_setupStep_Finish.inc b/gosa-core/setup/class_setupStep_Finish.inc
index 5fe91f8ce..a64fbcd05 100644
--- a/gosa-core/setup/class_setupStep_Finish.inc
+++ b/gosa-core/setup/class_setupStep_Finish.inc
@@ -53,8 +53,12 @@ class Step_Finish extends setup_step
   function execute()
   {
 
-    $info= posix_getgrgid(posix_getgid());
-    $webgroup = $info['name'];
+    if(!function_exists("posix_getgrgid")){
+      $webgroup = "";
+    }else{
+      $info= posix_getgrgid(posix_getgid());
+      $webgroup = $info['name'];
+    }
 
     /* Check if there is currently an active gosa.conf 
      */
diff --git a/gosa-core/setup/setup_finish.tpl b/gosa-core/setup/setup_finish.tpl
index 5b4c80ecd..4f29b9cd6 100644
--- a/gosa-core/setup/setup_finish.tpl
+++ b/gosa-core/setup/setup_finish.tpl
@@ -5,9 +5,24 @@
 	<p>	
 		{$msg2}
 	</p>
-	<tt>
-	chown root:{$webgroup} {$CONFIG_DIR}/{$CONFIG_FILE}<br>
-	chmod 640 {$CONFIG_DIR}/{$CONFIG_FILE}
+
+      {if $webgroup == ""}
+{t}Depending on the user name your webserver is running on:{/t}
+<tt>
+<pre> chown root:www-data {$CONFIG_DIR}/{$CONFIG_FILE}
+ chmod 640 {$CONFIG_DIR}/{$CONFIG_FILE}
+
+or
+
+ chown root:apache {$CONFIG_DIR}/{$CONFIG_FILE}
+ chmod 640 {$CONFIG_DIR}/{$CONFIG_FILE}
+</pre>
+{else}
+<pre>
+ chown root:{$webgroup} {$CONFIG_DIR}/{$CONFIG_FILE}
+ chmod 640 {$CONFIG_DIR}/{$CONFIG_FILE}
+</pre>
+{/if} 
 	</tt>
 	<p>	
 		<input type='submit' name='getconf' value='{t}Download configuration{/t}'>