From 8a7c894a46291f0920b33b4091efb67dbe933097 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 6 Apr 2010 15:35:36 +0000 Subject: [PATCH] modpython stuff has removed --- sfa/server/SfaAggregateModPython.py | 70 ----------------------------- sfa/server/SfaRegistryModPython.py | 69 ---------------------------- sfa/server/SfaSliceMgrModPython.py | 70 ----------------------------- sfa/server/sfa.aggregate.httpd.conf | 24 ---------- sfa/server/sfa.registry.httpd.conf | 24 ---------- sfa/server/sfa.slicemgr.httpd.conf | 24 ---------- 6 files changed, 281 deletions(-) delete mode 100755 sfa/server/SfaAggregateModPython.py delete mode 100755 sfa/server/SfaRegistryModPython.py delete mode 100755 sfa/server/SfaSliceMgrModPython.py delete mode 100644 sfa/server/sfa.aggregate.httpd.conf delete mode 100644 sfa/server/sfa.registry.httpd.conf delete mode 100644 sfa/server/sfa.slicemgr.httpd.conf diff --git a/sfa/server/SfaAggregateModPython.py b/sfa/server/SfaAggregateModPython.py deleted file mode 100755 index e1ab86dc..00000000 --- a/sfa/server/SfaAggregateModPython.py +++ /dev/null @@ -1,70 +0,0 @@ -# -# Apache mod_python interface -# -# Aaron Klingaman -# Mark Huang -# -# Copyright (C) 2004-2006 The Trustees of Princeton University -# - -import sys -import traceback -import xmlrpclib -from mod_python import apache - -from sfa.plc.api import SfaAPI -from sfa.util.debug import log - -api = SfaAPI(interface='aggregate') - -class unbuffered: - """ - Write to /var/log/httpd/error_log. See - - http://www.modpython.org/FAQ/faqw.py?req=edit&file=faq02.003.htp - """ - - def write(self, data): - sys.stderr.write(data) - sys.stderr.flush() - -#log = unbuffered() - -def handler(req): - try: - if req.method != "POST": - req.content_type = "text/html" - req.send_http_header() - req.write(""" - -SFA Aggregate API XML-RPC/SOAP Interface - -

SFA Aggregate API XML-RPC/SOAP Interface

Please use XML-RPC or SOAP to access the SFA API.

SFA Registry API XML-RPC/SOAP Interface

Please use XML-RPC or SOAP to access the SFA API.

SFA SliceMgr API XML-RPC/SOAP Interface

Please use XML-RPC or SOAP to access the SFA API.

- -""") - return apache.OK - - # Read request - request = req.read(int(req.headers_in['content-length'])) - - # mod_python < 3.2: The IP address portion of remote_addr is - # incorrect (always 0.0.0.0) when IPv6 is enabled. - # http://issues.apache.org/jira/browse/MODPYTHON-64?page=all - (remote_ip, remote_port) = req.connection.remote_addr - remote_addr = (req.connection.remote_ip, remote_port) - - # Handle request - response = api.handle(remote_addr, request) - - # Write response - req.content_type = "text/xml; charset=" + api.encoding - req.send_http_header() - req.write(response) - - return apache.OK - - except Exception, err: - # Log error in /var/log/httpd/(ssl_)?error_log - print >> log, err, traceback.format_exc() - return apache.HTTP_INTERNAL_SERVER_ERROR diff --git a/sfa/server/sfa.aggregate.httpd.conf b/sfa/server/sfa.aggregate.httpd.conf deleted file mode 100644 index 2e6f4f44..00000000 --- a/sfa/server/sfa.aggregate.httpd.conf +++ /dev/null @@ -1,24 +0,0 @@ -Listen 12346 - - - ErrorLog logs/sfa_ssl_error_log - TransferLog logs/sfa_ssl_access_log - CustomLog logs/ssl_request_log \ - "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b - LogLevel warn - - SSLEngine on - SSLProtocol all -SSLv2 - - SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW - SSLCertificateFile /etc/sfa/authorities/server.cert - SSLCertificateKeyFile /etc/sfa/authorities/server.key - SetEnvIf User-Agent ".*MSIE.*" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - - SetHandler mod_python - PythonPath "sys.path + ['/usr/lib/python2.5/site-packages/sfa/', '/usr/lib/python2.5/site-packages/sfa/server/']" - PythonHandler SfaAggregateModPython - - diff --git a/sfa/server/sfa.registry.httpd.conf b/sfa/server/sfa.registry.httpd.conf deleted file mode 100644 index 714fe553..00000000 --- a/sfa/server/sfa.registry.httpd.conf +++ /dev/null @@ -1,24 +0,0 @@ -Listen 12345 - - - ErrorLog logs/sfa_ssl_error_log - TransferLog logs/sfa_ssl_access_log - CustomLog logs/ssl_request_log \ - "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b - LogLevel warn - - SSLEngine on - SSLProtocol all -SSLv2 - - SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW - SSLCertificateFile /etc/sfa/authorities/server.cert - SSLCertificateKeyFile /etc/sfa/authorities/server.key - SetEnvIf User-Agent ".*MSIE.*" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - - SetHandler mod_python - PythonPath "sys.path + ['/usr/lib/python2.5/site-packages/sfa/', '/usr/lib/python2.5/site-packages/sfa/server/']" - PythonHandler SfaRegistryModPython - - diff --git a/sfa/server/sfa.slicemgr.httpd.conf b/sfa/server/sfa.slicemgr.httpd.conf deleted file mode 100644 index 6e3a8e87..00000000 --- a/sfa/server/sfa.slicemgr.httpd.conf +++ /dev/null @@ -1,24 +0,0 @@ -Listen 12347 - - - ErrorLog logs/sfa_ssl_error_log - TransferLog logs/sfa_ssl_access_log - CustomLog logs/ssl_request_log \ - "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b - LogLevel warn - - SSLEngine on - SSLProtocol all -SSLv2 - - SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW - SSLCertificateFile /etc/sfa/authorities/server.cert - SSLCertificateKeyFile /etc/sfa/authorities/server.key - SetEnvIf User-Agent ".*MSIE.*" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - - SetHandler mod_python - PythonPath "sys.path + ['/usr/lib/python2.5/site-packages/sfa/', '/usr/lib/python2.5/site-packages/sfa/server/']" - PythonHandler SfaSliceMgrModPython - - -- 2.43.0