Deduplicate the code in auth.fcgi and unauth.fcgi

But call the reunited code "invirt.fcgi" rather than the old "main.fcgi",
which was always annoying for tab-completion against "main.py".

svn path=/package_branches/invirt-web/cherrypy-rebased/; revision=2733

diff --git a/code/auth.fcgi b/code/auth.fcgi
deleted file mode 100755 (executable)
index a2004491dd295e53350edaeefa92806ffda611a3..0000000000000000000000000000000000000000
--- a/code/auth.fcgi
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/python
-"""Main FastCGI entry point for authenticated web interface"""
-
-import cherrypy
-import os
-import sys
-from main import InvirtWeb
-
-dev = False
-base_dir = os.path.dirname(__file__)
-
-def usage():
-    print >>sys.stderr, """%s [config]
-
-Run server as FastCGI, with CherryPy config from "main.conf".
-
-With `config`, run standalone with CherryPy config from `config`.
-""" % sys.argv[0]
-    sys.exit(2)
-
-if __name__ == "__main__":
-    if len(sys.argv) > 2:
-        usage()
-    if len(sys.argv) > 1:
-        if sys.argv[1] in ('-h', '--help'):
-            usage()
-        conf_file = sys.argv[1]
-        dev = True
-    else:
-        conf_file = os.path.join(base_dir, 'main.conf')
-
-    app_config = {
-        '/': {
-            'tools.invirtwebstate.on': True,
-            },
-        }
-                    
-    app = cherrypy.tree.mount(InvirtWeb(),
-                              '/',
-                              app_config)
-    app.merge(conf_file)
-    cherrypy.config.update(conf_file)
-
-    if dev:
-        cherrypy.server.quickstart()
-        cherrypy.engine.start()
-        cherrypy.engine.block()
-    else:
-        cherrypy.engine.start(blocking=False)
-        from flup.server.fcgi import WSGIServer
-        server = WSGIServer(cherrypy.tree)
-        server.run()

diff --git a/code/auth.fcgi b/code/auth.fcgi
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..b94e858171d9e3326629a2bec6da2c37ad138c76
--- /dev/null
+++ b/code/auth.fcgi
@@ -0,0 +1 @@
+invirt.fcgi
\ No newline at end of file

diff --git a/code/invirt.fcgi b/code/invirt.fcgi
new file mode 100644 (file)
index 0000000..385b562
--- /dev/null
+++ b/code/invirt.fcgi
@@ -0,0 +1,61 @@
+#!/usr/bin/python
+"""Main FastCGI entry point for web interface"""
+
+import cherrypy
+import os
+import sys
+
+import main
+
+dev = False
+base_dir = os.path.dirname(__file__)
+
+def usage():
+    print >>sys.stderr, """%s [config]
+
+Run server as FastCGI, with CherryPy config from "main.conf".
+
+With `config`, run standalone with CherryPy config from `config`.
+
+Run this script as either 'auth.fcgi' or 'unauth.fcgi', to get
+the authenticated or unauthenticated site respectively.
+""" % sys.argv[0]
+    sys.exit(2)
+
+if __name__ == "__main__":
+    if len(sys.argv) > 2:
+        usage()
+    if len(sys.argv) > 1:
+        if sys.argv[1] in ('-h', '--help'):
+            usage()
+        conf_file = sys.argv[1]
+        dev = True
+    else:
+        conf_file = os.path.join(base_dir, 'main.conf')
+
+    app_config = {
+        '/': {
+            'tools.invirtwebstate.on': True,
+            },
+        }
+
+    if os.path.basename(sys.argv[0]).startswith('auth'):
+        root = InvirtWeb()
+    elif os.path.basename(sys.argv[0]).startswith('unauth'):
+        root = InvirtUnauthWeb()
+    else:
+        usage()
+
+    app = cherrypy.tree.mount(root, '/', app_config)
+    app.merge(conf_file)
+    cherrypy.config.update(conf_file)
+
+    if dev:
+        cherrypy.server.quickstart()
+        cherrypy.engine.start()
+        cherrypy.engine.block()
+    else:
+        cherrypy.engine.start(blocking=False)
+        from flup.server.fcgi import WSGIServer
+        server = WSGIServer(cherrypy.tree)
+        server.run()

diff --git a/code/unauth.fcgi b/code/unauth.fcgi
deleted file mode 100755 (executable)
index 8dfbb98b738cd9c08c6542bd14d50a74f46d864a..0000000000000000000000000000000000000000
--- a/code/unauth.fcgi
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/python
-"""Main FastCGI entry point for unauthenticated web interface"""
-
-import cherrypy
-import os
-import sys
-from main import InvirtUnauthWeb
-
-dev = False
-base_dir = os.path.dirname(__file__)
-
-def usage():
-    print >>sys.stderr, """%s [config]
-
-Run server as FastCGI, with CherryPy config from "main.conf".
-
-With `config`, run standalone with CherryPy config from `config`.
-""" % sys.argv[0]
-    sys.exit(2)
-
-if __name__ == "__main__":
-    if len(sys.argv) > 2:
-        usage()
-    if len(sys.argv) > 1:
-        if sys.argv[1] in ('-h', '--help'):
-            usage()
-        conf_file = sys.argv[1]
-        dev = True
-    else:
-        conf_file = os.path.join(base_dir, 'main.conf')
-
-    app_config = {
-        '/': {
-            'tools.invirtwebstate.on': True,
-            },
-        }
-                    
-    app = cherrypy.tree.mount(InvirtUnauthWeb(),
-                              '/',
-                              app_config)
-    app.merge(conf_file)
-    cherrypy.config.update(conf_file)
-
-    if dev:
-        cherrypy.server.quickstart()
-        cherrypy.engine.start()
-        cherrypy.engine.block()
-    else:
-        cherrypy.engine.start(blocking=False)
-        from flup.server.fcgi import WSGIServer
-        server = WSGIServer(cherrypy.tree)
-        server.run()

diff --git a/code/unauth.fcgi b/code/unauth.fcgi
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..b94e858171d9e3326629a2bec6da2c37ad138c76
--- /dev/null
+++ b/code/unauth.fcgi
@@ -0,0 +1 @@
+invirt.fcgi
\ No newline at end of file