vHosts web server 0.2 http web server functioning. https support needs a little more work.

1 files changed, 311 insertions, 91 deletions

diff --git a/config/vhosts/vhosts.inc b/config/vhosts/vhosts.inc
index 0cb88064..8e013f4b 100644
--- a/config/vhosts/vhosts.inc
+++ b/config/vhosts/vhosts.inc
@@ -33,148 +33,365 @@
 
 function pkg_is_service_running($servicename) 
 {
-    exec("/bin/ps ax | awk '{ print $5 }'", $psout);
-    array_shift($psout);
-    foreach($psout as $line) {
-    	$ps[] = trim(array_pop(explode(' ', array_pop(explode('/', $line)))));
-    }
-    if(is_service_running($servicename, $ps) or is_process_running($servicename) ) {
-        return true;
-    }
-    else {
-        return false;
-    }
+	exec("/bin/ps ax | awk '{ print $5 }'", $psout);
+	array_shift($psout);
+	foreach($psout as $line) {
+		$ps[] = trim(array_pop(explode(' ', array_pop(explode('/', $line)))));
+	}
+	if(is_service_running($servicename, $ps) or is_process_running($servicename) ) {
+		return true;
+	}
+	else {
+		return false;
+	}
 }
 
 function byte_convert( $bytes ) {
+	if ($bytes<=0)
+		return '0 Byte';
 
-    if ($bytes<=0)
-        return '0 Byte';
-
-    $convention=1000; //[1000->10^x|1024->2^x]
-    $s=array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB');
-    $e=floor(log($bytes,$convention));
-    return round($bytes/pow($convention,$e),2).' '.$s[$e];
+	$convention=1000; //[1000->10^x|1024->2^x]
+	$s=array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB');
+	$e=floor(log($bytes,$convention));
+	return round($bytes/pow($convention,$e),2).' '.$s[$e];
 }
 
- 
+
+//sort array
+	function sort_host($a, $b){
+		return strcmp($a["host"], $b["host"]);
+	}
+
+	function sort_port($a, $b){
+		return strcmp($a["port"], $b["port"]);
+	}
+
+	function sort_ip_address($a, $b){
+		return natsort($a["ipaddress"], $b["ipaddress"]);
+	}
+
+
 function vhosts_sync_package_php()
 {
+	global $config; 
+	if($config['installedpackages']['vhosts']['config'] != "") {
 
-  global $config; 
-  if($config['installedpackages']['vhosts']['config'] != "") {
+		conf_mount_rw();
+		config_unlock();
 
-    conf_mount_rw();
-    config_unlock();
-		
-		$tmp = "<?php\n";
+		$tmp = "#\n";
+		$tmp .= "# lighttpd configuration file\n";
+		$tmp .= "#\n";
+		$tmp .= "# use a it as base for lighttpd 1.0.0 and above\n";
+		$tmp .= "#\n";
+		$tmp .= "############ Options you really have to take care of ####################\n";
 		$tmp .= "\n";
-		$tmp .= "// Set time limit to indefinite execution\n";
-		$tmp .= "set_time_limit (0);\n";
+		$tmp .= "## FreeBSD!\n";
+		$tmp .= "server.event-handler		= \"freebsd-kqueue\"\n";
+		$tmp .= "server.network-backend		= \"writev\"  ## Fixes 7.x upload issues\n";
 		$tmp .= "\n";
-		$tmp .= "//run this program as long as the pid file exists\n";
-		$tmp .= "\$filename = '/tmp/phpmonitor.pid';\n";
-		$tmp .= "\$fp = fopen(\$filename, 'w');\n";
-		$tmp .= "fwrite(\$fp, \"If this file is deleted then phpmonitor will stop.\");\n";
-		$tmp .= "fclose(\$fp);\n";
-		$tmp .= "unset(\$filename);\n";
+		$tmp .= "## modules to load\n";
+		$tmp .= "server.modules =   (\n";
+		$tmp .= "				  \"mod_accesslog\",\n";
+		$tmp .= "				  \"mod_access\", \"mod_accesslog\",\n";
+		$tmp .= "                  \"mod_fastcgi\", \"mod_cgi\",\"mod_rewrite\"\n";
+		$tmp .= "				)\n";
 		$tmp .= "\n";
-		$tmp .= "//require_once(\"config.inc\");\n";
-		$tmp .= "//global \$config;\n";
-		$tmp .= "//\$syslogaddress = \$config['syslog']['remoteserver'];\n";
-		$tmp .= "\$syslogaddress = \"127.0.0.1\";\n";
-		$tmp .= "\$syslogport = 514;\n";
-		$tmp .= "echo \"syslog server: \".\$syslogaddress.\"\\n\";\n";
+		$tmp .= "## Unused modules\n";
+		$tmp .= "#                               \"mod_setenv\",\n";
+		$tmp .= "#                               \"mod_compress\"\n";
+		$tmp .= "#                               \"mod_redirect\",\n";
+		$tmp .= "#                               \"mod_rewrite\",\n";
+		$tmp .= "#                               \"mod_ssi\",\n";
+		$tmp .= "#                               \"mod_usertrack\",\n";
+		$tmp .= "#                               \"mod_expire\",\n";
+		$tmp .= "#                               \"mod_secdownload\",\n";
+		$tmp .= "#                               \"mod_rrdtool\",\n";
+		$tmp .= "#                               \"mod_auth\",\n";
+		$tmp .= "#                               \"mod_status\",\n";
+		$tmp .= "#                               \"mod_alias\",\n";
+		$tmp .= "#                               \"mod_proxy\",\n";
+		$tmp .= "#                               \"mod_simple_vhost\",\n";
+		$tmp .= "#                               \"mod_evhost\",\n";
+		$tmp .= "#                               \"mod_userdir\",\n";
+		$tmp .= "#                               \"mod_cgi\",\n";
+		$tmp .= "#                                \"mod_accesslog\"\n";
 		$tmp .= "\n";
+		$tmp .= "## a static document-root, for virtual-hosting take look at the\n";
+		$tmp .= "## server.virtual-* options\n";
+		$tmp .= "server.document-root        = \"/usr/local/vhosts/\"\n";
 		$tmp .= "\n";
+		$tmp .= "# Maximum idle time with nothing being written (php downloading)\n";
+		$tmp .= "server.max-write-idle = 999\n";
 		$tmp .= "\n";
-		$tmp .= "function send_to_syslog(\$syslogaddress, \$syslogport, \$syslogmsg) {\n";
+		$tmp .= "## where to send error-messages to\n";
+		$tmp .= "server.errorlog             = \"/var/log/lighttpd.error.log\"\n";
 		$tmp .= "\n";
-		$tmp .= "  \$fp = fsockopen(\"udp://\".\$syslogaddress, \$syslogport, \$errno, \$errstr);\n";
-		$tmp .= "  if (!\$fp) {\n";
-		$tmp .= "      //echo \"ERROR: \$errno - \$errstr<br />\\n\";\n";
-		$tmp .= "  } else {\n";
-		$tmp .= "      fwrite(\$fp, \$syslogmsg);\n";
-		$tmp .= "      fclose(\$fp);\n";
-		$tmp .= "  }\n";
+		$tmp .= "# files to check for if .../ is requested\n";
+		$tmp .= "server.indexfiles           = ( \"index.php\", \"index.html\",\n";
+		$tmp .= "                                \"index.htm\", \"default.htm\" )\n";
 		$tmp .= "\n";
-		$tmp .= "}\n";
+		$tmp .= "# mimetype mapping\n";
+		$tmp .= "mimetype.assign             = (\n";
+		$tmp .= "  \".pdf\"          =>      \"application/pdf\",\n";
+		$tmp .= "  \".sig\"          =>      \"application/pgp-signature\",\n";
+		$tmp .= "  \".spl\"          =>      \"application/futuresplash\",\n";
+		$tmp .= "  \".class\"        =>      \"application/octet-stream\",\n";
+		$tmp .= "  \".ps\"           =>      \"application/postscript\",\n";
+		$tmp .= "  \".torrent\"      =>      \"application/x-bittorrent\",\n";
+		$tmp .= "  \".dvi\"          =>      \"application/x-dvi\",\n";
+		$tmp .= "  \".gz\"           =>      \"application/x-gzip\",\n";
+		$tmp .= "  \".pac\"          =>      \"application/x-ns-proxy-autoconfig\",\n";
+		$tmp .= "  \".swf\"          =>      \"application/x-shockwave-flash\",\n";
+		$tmp .= "  \".tar.gz\"       =>      \"application/x-tgz\",\n";
+		$tmp .= "  \".tgz\"          =>      \"application/x-tgz\",\n";
+		$tmp .= "  \".tar\"          =>      \"application/x-tar\",\n";
+		$tmp .= "  \".zip\"          =>      \"application/zip\",\n";
+		$tmp .= "  \".mp3\"          =>      \"audio/mpeg\",\n";
+		$tmp .= "  \".m3u\"          =>      \"audio/x-mpegurl\",\n";
+		$tmp .= "  \".wma\"          =>      \"audio/x-ms-wma\",\n";
+		$tmp .= "  \".wax\"          =>      \"audio/x-ms-wax\",\n";
+		$tmp .= "  \".ogg\"          =>      \"audio/x-wav\",\n";
+		$tmp .= "  \".wav\"          =>      \"audio/x-wav\",\n";
+		$tmp .= "  \".gif\"          =>      \"image/gif\",\n";
+		$tmp .= "  \".jpg\"          =>      \"image/jpeg\",\n";
+		$tmp .= "  \".jpeg\"         =>      \"image/jpeg\",\n";
+		$tmp .= "  \".png\"          =>      \"image/png\",\n";
+		$tmp .= "  \".xbm\"          =>      \"image/x-xbitmap\",\n";
+		$tmp .= "  \".xpm\"          =>      \"image/x-xpixmap\",\n";
+		$tmp .= "  \".xwd\"          =>      \"image/x-xwindowdump\",\n";
+		$tmp .= "  \".css\"          =>      \"text/css\",\n";
+		$tmp .= "  \".html\"         =>      \"text/html\",\n";
+		$tmp .= "  \".htm\"          =>      \"text/html\",\n";
+		$tmp .= "  \".js\"           =>      \"text/javascript\",\n";
+		$tmp .= "  \".asc\"          =>      \"text/plain\",\n";
+		$tmp .= "  \".c\"            =>      \"text/plain\",\n";
+		$tmp .= "  \".conf\"         =>      \"text/plain\",\n";
+		$tmp .= "  \".text\"         =>      \"text/plain\",\n";
+		$tmp .= "  \".txt\"          =>      \"text/plain\",\n";
+		$tmp .= "  \".dtd\"          =>      \"text/xml\",\n";
+		$tmp .= "  \".xml\"          =>      \"text/xml\",\n";
+		$tmp .= "  \".mpeg\"         =>      \"video/mpeg\",\n";
+		$tmp .= "  \".mpg\"          =>      \"video/mpeg\",\n";
+		$tmp .= "  \".mov\"          =>      \"video/quicktime\",\n";
+		$tmp .= "  \".qt\"           =>      \"video/quicktime\",\n";
+		$tmp .= "  \".avi\"          =>      \"video/x-msvideo\",\n";
+		$tmp .= "  \".asf\"          =>      \"video/x-ms-asf\",\n";
+		$tmp .= "  \".asx\"          =>      \"video/x-ms-asf\",\n";
+		$tmp .= "  \".wmv\"          =>      \"video/x-ms-wmv\",\n";
+		$tmp .= "  \".bz2\"          =>      \"application/x-bzip\",\n";
+		$tmp .= "  \".tbz\"          =>      \"application/x-bzip-compressed-tar\",\n";
+		$tmp .= "  \".tar.bz2\"      =>      \"application/x-bzip-compressed-tar\"\n";
+		$tmp .= " )\n";
 		$tmp .= "\n";
+		$tmp .= "# Use the \"Content-Type\" extended attribute to obtain mime type if possible\n";
+		$tmp .= "#mimetypes.use-xattr        = \"enable\"\n";
 		$tmp .= "\n";
-		$tmp .= "//\$msg = \"1.begin loop. \".date('r').\"\\n\";\n";
-		$tmp .= "//\$fp = fopen('/tmp/phpmonitor.txt', 'a');\n";
-		$tmp .= "//fwrite(\$fp, \$msg.\"\\n\");\n";
-		$tmp .= "//fclose(\$fp);\n";
+		$tmp .= "#### accesslog module\n";
+		$tmp .= "#accesslog.filename          = \"/dev/null\"\n";
 		$tmp .= "\n";
-		$tmp .= "\$x = 0;\n";
-		$tmp .= "while(\$x == 0) {\n";
+		$tmp .= "## deny access the file-extensions\n";
+		$tmp .= "#\n";
+		$tmp .= "# ~    is for backupfiles from vi, emacs, joe, ...\n";
+		$tmp .= "# .inc is often used for code includes which should in general not be part\n";
+		$tmp .= "#      of the document-root\n";
+		$tmp .= "url.access-deny             = ( \"~\", \".db\" )\n";
 		$tmp .= "\n";
 		$tmp .= "\n";
-		$tmp .= "  if(!file_exists('/tmp/phpmonitor.pid')) {\n";
-		$tmp .= "    //if the file does not exist then close the program.\n";
-		$tmp .= "    echo \"program closing\\n\";\n";
-		$tmp .= "    return;\n";
-		$tmp .= "  }\n";
+		$tmp .= "######### Options that are good to be but not neccesary to be changed #######\n";
 		$tmp .= "\n";
+		$tmp .= "## bind to port (default: 80)\n";
+		$tmp .= "server.port                = 8001\n";
 		$tmp .= "\n";
+		$tmp .= "#the regex method isn't working\n";
+		$tmp .= "#\$HTTP[\"host\"] =~ \"(^|\\.)host01\\.com\$\" {\n";
+		$tmp .= "#	server.document-root        = \"/usr/local/vhosts/host01\"\n";
+		$tmp .= "#}\n";
 		$tmp .= "\n";
-		      
-		foreach($config['installedpackages']['vhosts']['config'] as $rowhelper) {
+
+		$vhostarray = $config['installedpackages']['vhosts']['config'];
+		if (count(vhostarray) > 1) {
+			usort($vhostarray, 'sort_ipaddress');
+			usort($vhostarray, 'sort_host');
+			usort($vhostarray, 'sort_port');
+		}
+		$ipaddress_previous_value = '';
+		$host_previous_value = '';
+		$port_previous_value = '';
+		$ipaddress_and_port_previous_value = '';
+		$x=1;
+		foreach($vhostarray as $rowhelper) {
 			if ($rowhelper['enabled'] != "false") {
-				$tmp_php = base64_decode($rowhelper['php']);
-				if (strlen($tmp_php) > 0) {
-					$tmp .= "// name: ".$rowhelper['name']." \n";
-					$tmp .= "// description: ".$rowhelper['description']." \n\n";
-					$tmp .= base64_decode($rowhelper['php']);
-					$tmp .= "\n";
+
+				$host = $rowhelper['host'];
+				$ipaddress = $rowhelper['ipaddress'];
+				$port = $rowhelper['port'];
+				$directory = $rowhelper['directory'];
+				if (strlen($rowhelper['certificate']) > 0) {
+					$certificate = base64_decode($rowhelper['certificate']);
 				}
-			}
+				if (strlen($rowhelper['privatekey']) > 0) {
+					$privatekey = base64_decode($rowhelper['privatekey']);
+				}
+
+				//set directory default to the host
+					if (strlen($directory) == 0) { $directory = $host; }
+
+				//if the vhost directory doesn't exist then create it
+					//echo '/usr/local/vhosts/'.$directory.'<br />';
+					if (!is_dir('/usr/local/vhosts/'.$directory)) {
+						exec("mkdir /usr/local/vhosts/".$directory);
+					}
+
+				//set the default port
+					if (strlen($port) == 0) { $port = '8001'; }
 
+				if ($ipaddress.':'.$port != $ipaddress_and_port_previous_value) {
+					if ($x > 1) { $tmp .= "}\n\n"; }
+					$tmp .= "\$SERVER[\"socket\"] == \"".$ipaddress.":".$port."\" {\n";
+				}
+
+				if (strlen($rowhelper['description']) > 0) {
+					$tmp .= "# ".$rowhelper['description']." \n\n";
+				}
+				$tmp .= "	\$HTTP[\"host\"] == \"".$host."\" {\n";
+				$tmp .= "		server.document-root        = \"/usr/local/vhosts/".$directory."\"\n";
+
+				//enable ssl if the cert and key were both provided
+				if (strlen($rowhelper['certificate']) > 0 && strlen($rowhelper['privatekey']) > 0) {
+					$pem_file = "/var/etc/cert-vhosts-".$ipaddress."-".$port.".pem";
+					$fout = fopen($pem_file,"w");
+					fwrite($fout, $certificate.$privatekey);
+					fclose($fout);
+					$tmp .= "		ssl.pemfile = \"".$pem_file."\"\n";
+					$tmp .= "		ssl.engine = \"enable\"\n";
+					unset($pem_file);
+				}
+				if (count(vhostarray) > 0) {
+					$tmp .= "	}\n";
+				}
+
+				$ipaddress_previous_value = $ipaddress;
+				$host_previous_value = $host;
+				$port_previous_value = $port;
+				$ipaddress_and_port_previous_value = $ipaddress.':'.$port;
+				$x++;
+			}
 		}
+		$tmp .= "}\n";
+
 
+		/*
+		$tmp .= "\$SERVER[\"socket\"] == \"10.7.0.1:8001\" {\n";
+		$tmp .= "	\$HTTP[\"host\"] == \"vhost01.com\" {\n";
+		$tmp .= "		#ssl.pemfile = \"/var/www/certs/localhost.pem\"\n";
+		$tmp .= "		#ssl.engine = \"enable\"\n";
+		$tmp .= "		server.document-root        = \"/usr/local/vhosts/host01\"\n";
+		$tmp .= "		#server.errorlog = \"/var/log/lighttpd/nixcraft/error.log\"\n";
+		$tmp .= "		#accesslog.filename = \"/var/log/lighttpd/nixcraft/access.log\"\n";
+		$tmp .= "		#server.error-handler-404 = \"/e404.php\"\n";
+		$tmp .= "	}\n";
 		$tmp .= "\n";
+		$tmp .= "	\$HTTP[\"host\"] == \"vhost03.com\" {\n";
+		$tmp .= "		#ssl.pemfile = \"/var/www/certs/localhost.pem\"\n";
+		$tmp .= "		#ssl.engine = \"enable\"\n";
+		$tmp .= "		server.document-root        = \"/usr/local/vhosts/host03\"\n";
+		$tmp .= "		#server.errorlog = \"/var/log/lighttpd/nixcraft/error.log\"\n";
+		$tmp .= "		#accesslog.filename = \"/var/log/lighttpd/nixcraft/access.log\"\n";
+		$tmp .= "		#server.error-handler-404 = \"/e404.php\"\n";
+		$tmp .= "	}\n";
+		$tmp .= "}\n";
+		$tmp .= "\n";
+		$tmp .= "\$SERVER[\"socket\"] == \"10.7.0.1:8002\" {\n";
+		$tmp .= "	\$HTTP[\"host\"] == \"vhost02.com\" {\n";
+		$tmp .= "		#ssl.pemfile = \"/var/www/certs/localhost.pem\"\n";
+		$tmp .= "		#ssl.engine = \"enable\"\n";
+		$tmp .= "		server.document-root = \"/usr/local/vhosts/host02\"\n";
+		$tmp .= "		#server.errorlog = \"/var/log/lighttpd/nixcraft/error.log\"\n";
+		$tmp .= "		#accesslog.filename = \"/var/log/lighttpd/nixcraft/access.log\"\n";
+		$tmp .= "		#server.error-handler-404 = \"/e404.php\"\n";
+		$tmp .= "	}\n";
+		$tmp .= "}\n";
+		*/
 		$tmp .= "\n";
-		$tmp .= "  //usleep(100000);  //micro seconds //2 seconds 2000000\n";
-		$tmp .= "  sleep(1); //in seconds\n";
-		$tmp .= "  //if (\$x > 60){ exit; } //exit after 60 seconds for testing\n";
-		$tmp .= "} //emd while\n";
+		$tmp .= "## error-handler for status 404\n";
+		$tmp .= "#server.error-handler-404   = \"/error-handler.html\"\n";
+		$tmp .= "#server.error-handler-404   = \"/error-handler.php\"\n";
 		$tmp .= "\n";
+		$tmp .= "## to help the rc.scripts\n";
+		$tmp .= "server.pid-file            = \"/var/run/lighty-vhosts.pid\"\n";
 		$tmp .= "\n";
-		$tmp .= "?>";
+		$tmp .= "## virtual directory listings\n";
+		$tmp .= "server.dir-listing         = \"disable\"\n";
+		$tmp .= "\n";
+		$tmp .= "## enable debugging\n";
+		$tmp .= "debug.log-request-header   = \"disable\"\n";
+		$tmp .= "debug.log-response-header  = \"disable\"\n";
+		$tmp .= "debug.log-request-handling = \"disable\"\n";
+		$tmp .= "debug.log-file-not-found   = \"disable\"\n";
+		$tmp .= "\n";
+		$tmp .= "#### compress module\n";
+		$tmp .= "#compress.cache-dir         = \"/tmp/lighttpd/cache/compress/\"\n";
+		$tmp .= "#compress.filetype          = (\"text/plain\", \"text/html\")\n";
+		$tmp .= "\n";
+		$tmp .= "#server.network-backend = \"writev\"\n";
+		$tmp .= "server.upload-dirs = ( \"/root/\", \"/tmp/\", \"/var/\" )\n";
+		$tmp .= "server.max-request-size    = 2097152\n";
+		$tmp .= "\n";
+		$tmp .= "#### fastcgi module\n";
+		$tmp .= "## read fastcgi.txt for more info\n";
+		$tmp .= "fastcgi.server = ( \".php\" =>\n";
+		$tmp .= "	( \"localhost\" =>\n";
+		$tmp .= "		(\n";
+		$tmp .= "			\"socket\" => \"/tmp/php5-fastcgi.socket\",\n";
+		$tmp .= "			\"min-procs\" => 1,\n";
+		$tmp .= "			\"max-procs\" => 1,\n";
+		$tmp .= "			\"idle-timeout\" => 0,\n";
+		$tmp .= "			\"bin-environment\" => (\n";
+		$tmp .= "				\"PHP_FCGI_MAX_REQUESTS\" => \"500\",\n";
+		$tmp .= "				\"PHP_FCGI_CHILDREN\" => \"1\"\n";
+		$tmp .= "			),\n";
+		$tmp .= "			\"bin-path\" => \"/usr/local/php5/php-cgi\"\n";
+		$tmp .= "		)\n";
+		$tmp .= "	)\n";
+		$tmp .= ")\n";
+		$tmp .= "\n";
+		$tmp .= "#### CGI module\n";
+		$tmp .= "cgi.assign                 = ( \".cgi\" => \"\" )\n";
 
-		$fout = fopen("/usr/local/pkg/vhosts.php","w");
+		$fout = fopen("/var/etc/lighty-vhosts.conf","w");
 		fwrite($fout, $tmp);
 		unset($tmp);
 		fclose($fout);
-		          
+
 		conf_mount_ro();
 
-  }
+	}
 }
 
 
-function php_sync_package() 
-{
-  
+function php_sync_package() {
 	global $config;   
 	vhosts_sync_package_php();
-
 }
-    
 
-function php_install_command() 
-{
+
+function php_install_command() {
 
 	global $config;
 	conf_mount_rw();
 	config_lock();
 
 	if (!is_dir('/usr/local/www/packages/')) {
-	   exec("mkdir /usr/local/www/packages/");
+		exec("mkdir /usr/local/www/packages/");
 	}
-	
+
 	if (!is_dir('/usr/local/www/packages/vhosts/')) {
-	   exec("mkdir /usr/local/www/packages/vhosts/");
+		exec("mkdir /usr/local/www/packages/vhosts/");
+	}
+
+	if (!is_dir('/usr/local/vhosts/')) {
+		exec("mkdir /usr/local/vhosts/");
 	}
 
 	//rename PHP files from .tmp to .php
@@ -184,8 +401,12 @@ function php_install_command()
 	exec("cp /tmp/vhosts_php_edit.tmp /usr/local/www/packages/vhosts/vhosts_php_edit.php");
 	unlink_if_exists("/tmp/vhosts_php_edit.tmp");
 
+	exec("cp /tmp/system_advanced_create_certs.tmp /usr/local/www/packages/vhosts/system_advanced_create_certs.php");
+	unlink_if_exists("/tmp/system_advanced_create_certs.tmp");
+
 	//extract php5
-	exec("cp /tmp/vhosts_php_edit.tmp /usr/local/www/packages/vhosts/vhosts_php_edit.php");
+	chdir('/tmp');
+	exec("tar zxvf /tmp/php5.tar.gz -C /usr/local/");
 	unlink_if_exists("/tmp/php5.tar.gz");
 
   //write_config();
@@ -193,14 +414,13 @@ function php_install_command()
 	write_rcfile(array(
 		"file" => "vhosts.sh",
 		"start" => "/usr/local/sbin/lighttpd -f /var/etc/lighty-vhosts.conf",
-		"stop" => "rm /tmp/phpmonitor.pid"
+		"stop" => "kill `cat /var/run/lighty-vhosts.pid`"
 		)
 	);
 
 	php_sync_package();
-	//$handle = popen("/usr/local/etc/rc.d/vhosts.sh start", "r");
-	//pclose($handle);
-	
+
+
 	//if (pkg_is_service_running('vhosts')) {  
 		//documentation purposes
 	//}