- add perl-GD for plot-latlong

[myplc.git] / plc.d / httpd

diff --git a/plc.d/httpd b/plc.d/httpd
index c05e453..6f10515 100755 (executable)
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -7,7 +7,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: httpd,v 1.4 2006/07/10 21:08:46 mlhuang Exp $
+# $Id: httpd,v 1.7 2006/10/30 22:38:22 mlhuang Exp $
 #
 
 # Source function library and configuration
@@ -36,7 +36,7 @@ case "$1" in
        dialog "$MESSAGE"
 
        # Set the default include path
-       include_path=".:$DocumentRoot/planetlab/includes:/etc/planetlab/php:/usr/share/plc_api/php"
+       include_path=".:$DocumentRoot/planetlab/includes:$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
@@ -129,6 +129,10 @@ EOF
        # Make alpina-logs directory writable for bootmanager log upload
        chown apache:apache $DocumentRoot/alpina-logs/nodes
 
+       # Make the Drupal files upload directory owned by Apache
+       mkdir -p $DocumentRoot/files
+       chown apache:apache $DocumentRoot/files
+
        # Old style PHP constants
        mkdir -p /etc/planetlab/php
        cat >/etc/planetlab/php/site_constants.php <<"EOF"