X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.d%2Fhttpd;h=f62c66c32466e7198f489001dd44cc62d033a440;hb=6469aed9563248b2d3c78a1b48ad35f0b4d343a3;hp=30e5ce347f91999b0b1a163313fd109bbcf99c33;hpb=a286a32ab8c74d2e0aff725ce099fec57a14f715;p=myplc.git

diff --git a/plc.d/httpd b/plc.d/httpd
index 30e5ce3..f62c66c 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -1,14 +1,14 @@
 #!/bin/bash
+# $Id$
+# $URL$
 #
-# priority: 700
+# priority: 600
 #
 # Configure Apache web server
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-#
 
 # Source function library and configuration
 . /etc/plc.d/functions
@@ -24,6 +24,15 @@ httpd_conf=/etc/httpd/conf/httpd.conf
 ssl_conf=/etc/httpd/conf.d/ssl.conf
 plc_conf=/etc/httpd/conf.d/plc.conf
 
+function disable_file () {
+    file=$1; shift
+    [ -f $file ] && mv -f $file $file.disabled
+}
+function enable_file () {
+    file=$1; shift
+    [ ! -f $file ] && mv -f $file.disabled $file
+}
+
 case "$1" in
     start)
 	if [ "$PLC_API_ENABLED" != "1" -a \
@@ -35,19 +44,18 @@ case "$1" in
 	MESSAGE=$"Starting web server"
 	dialog "$MESSAGE"
 
-	# Set the document root to /data/var/www/html (static files
-	# and PlanetLabConf only, no Drupal or admin pages) if the web
-	# server should not run on this machine.
+	# set document root - not really useful on fedora but just in case
+	sed -i -e "s@^DocumentRoot.*@DocumentRoot \"$DocumentRoot\"@" $httpd_conf
+	# whether WWW is enabled or not : 
 	if [ "$PLC_WWW_ENABLED" != "1" ] ; then
-	    sed -i -e "s@^DocumentRoot.*@DocumentRoot \"/data$DocumentRoot\"@" $httpd_conf
-	    ln -nsf $DocumentRoot/PlanetLabConf /data$DocumentRoot/PlanetLabConf
+	    # avoid hitting drupal, that would try to connect to the db and create noise
+	    disable_file $DocumentRoot/index.php
 	else
-	    sed -i -e "s@^DocumentRoot.*@DocumentRoot \"$DocumentRoot\"@" $httpd_conf
-	    rm -f /data$DocumentRoot/PlanetLabConf
+	    enable_file $DocumentRoot/index.php
 	fi
 
 	# Set the default include path
-	include_path=".:$DocumentRoot/planetlab/includes:$DocumentRoot/plkit/php:/etc/planetlab/php:/usr/share/plc_api/php"
+	include_path=".:$DocumentRoot/planetlab/includes:$DocumentRoot/plekit/php:$DocumentRoot/generated:/etc/planetlab/php:/usr/share/plc_api/php"
 	sed -i -e "s@[;]*include_path = \"\.:.*\"@include_path = \"$include_path\"@" $php_ini
 
 	# Disable default Listen directive
@@ -197,7 +205,7 @@ EOF
 
 	## patch php.ini
 	# memory limit
-	sed -i -e 's,^memory_limit = 8M *;,memory_limit = 24M ; patch myplc -- ,' $php_ini 
+	sed -i -e 's,^memory_limit = 32M *;,memory_limit = 80M ; patch myplc -- ,' $php_ini 
 	# log_errors : is On by default
 	# error_log
 	if ! grep '^error_log *=' $php_ini > /dev/null ; then