[Tikiwiki-cvs] tiki setup.sh,1.2,1.3 tiki-setup.php,1.35,1.36

[<ro...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1:/tmp/cvs-serv25427

Modified Files:
	setup.sh tiki-setup.php 
Log Message:
Setup changes to report nicely if not configured

Index: setup.sh
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/setup.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.sh	10 Jan 2003 17:18:34 -0000	1.2
+++ setup.sh	11 Feb 2003 17:53:46 -0000	1.3
@@ -12,6 +12,14 @@
 Alternatively, you may wish to set both the user and group:
   
   su -c '$0 mylogin nobody'
+
+This will allow you to delete certain files/directories without becoming root.
+  
+Or, if you can't become root, but are a member of the group apache runs under,
+you can type:
+
+  $0 mylogin nobody
+  
 EOF
 exit 1
 fi
@@ -36,6 +44,6 @@
 if [ -n "$2" ];
 then
 	chgrp -R $2 modules/cache templates_c
-	chmod g+w modules/cache templates_c
+	chmod -R g+w modules/cache templates_c
 fi
 

Index: tiki-setup.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-setup.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- tiki-setup.php	10 Feb 2003 14:45:31 -0000	1.35
+++ tiki-setup.php	11 Feb 2003 17:53:47 -0000	1.36
@@ -1,5 +1,48 @@
 <?php
 
+$user = @posix_getpwuid(@posix_getuid());
+$wwwuser = $user ? $user['name'] : false;
+unset($user);
+if (!$wwwuser) {
+	$wwwuser = 'nobody (or the user account the web server is running under)';
+}
+$docroot = $_SERVER['DOCUMENT_ROOT'];
+
+$errors = '';
+
+if (!is_writeable('templates_c')) {
+	$errors .= "$docroot/templates_c is not writeable by $wwwuser.\n";
+}
+if (!is_writeable('modules/cache')) {
+	$errors .= "$docroot/modules/cache is not writeable by $wwwuser.\n";
+}
+
+if ($errors) {
+	print <<<qq
+<pre>
+Your tiki is not properly set up:
+
+$errors
+To set up your tiki, log in to the system running tiki,
+and type the following commands:
+
+\$ bash
+\$ cd $docroot
+\$ su -c './setup.sh $wwwuser'
+
+or
+
+\$ su -c './setup.sh mylogin $wwwuser'
+
+Once you have executed these commands, this message will disappear!
+
+qq;
+exit;
+}
+unset($docroot);
+unset($errors);
+unset($wwwuser);
+
 class timer
         {
         function parseMicro($micro)