From 19b2e23b5e3c2d77ce20e730ee03cab3b7416de3 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Fri, 27 Oct 2006 20:29:04 +0000 Subject: [PATCH] - new_plc_www and new_plc_api changes: fix includes path - got rid of oldapi, redirect all http://.../PLCAPI accesses to https://.../PLCAPI. Although as far as i know, most XML-RPC clients don't understand 302 redirects. - use new_plc_api ModPython interface --- plc.d/httpd | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/plc.d/httpd b/plc.d/httpd index 45e6234..c05e453 100755 --- a/plc.d/httpd +++ b/plc.d/httpd @@ -7,7 +7,7 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: httpd,v 1.3 2006/06/23 20:29:22 mlhuang Exp $ +# $Id: httpd,v 1.4 2006/07/10 21:08:46 mlhuang Exp $ # # Source function library and configuration @@ -36,8 +36,8 @@ case "$1" in dialog "$MESSAGE" # Set the default include path - include_path=".:$DocumentRoot/includes:$DocumentRoot/generated:/etc/planetlab/php" - sed -i -e "s@;include_path = \"\.:.*\"@include_path = \"$include_path\"@" $php_ini + include_path=".:$DocumentRoot/planetlab/includes:/etc/planetlab/php:/usr/share/plc_api/php" + sed -i -e "s@[;]*include_path = \"\.:.*\"@include_path = \"$include_path\"@" $php_ini # Disable default Listen directive sed -i -e '/^Listen/d' $httpd_conf @@ -83,8 +83,7 @@ case "$1" in Listen ${!http_port} Redirect /db https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/db - # XXX Not yet until we can get rid of oldapi - # Redirect /$PLC_API_PATH https://$PLC_API_HOST:$PLC_API_PORT/$PLC_API_PATH + Redirect /$PLC_API_PATH https://$PLC_API_HOST:$PLC_API_PORT/$PLC_API_PATH EOF fi @@ -105,9 +104,9 @@ EOF if [ "$PLC_API_ENABLED" = "1" ] ; then cat < - SetHandler python-program + SetHandler mod_python PythonPath "sys.path + ['/usr/share/plc_api']" - PythonHandler mod_pythonXMLRPC + PythonHandler ModPython EOF else -- 2.43.0