Changeset 2739 for package_branches/invirt-web/cherrypy-rebased/code

Timestamp:

Dec 21, 2009, 12:05:15 AM (15 years ago)

Author:

quentin

Message:

Properly separate the auth.fcgi and unauth.fcgi scripts

Location:

package_branches/invirt-web/cherrypy-rebased/code

Files:

• auth.fcgi (added)
• invirt.fcgi (modified) (3 diffs)
• main.conf (modified) (1 diff)
• unauth.fcgi (added)

package_branches/invirt-web/cherrypy-rebased/code/invirt.fcgi

@@ -12 +12 @@
 
 def usage():
-    print >>sys.stderr, """%s [config]
+    argv0_dir = os.path.dirname(sys.argv[0])
+    print >>sys.stderr, """%s <unauth|auth> [config]
+%s/auth.fcgi [config]
+%s/unauth.fcgi [config]
 
 Run server as FastCGI, with CherryPy config from "main.conf".
@@ -19 +22 @@
 
 Run this script as either 'auth.fcgi' or 'unauth.fcgi', to get
-the authenticated or unauthenticated site respectively.
-""" % sys.argv[0]
+the authenticated or unauthenticated site respectively, or pass
+'auth' or 'unauth' as the first parameter.
+""" % (sys.argv[0], argv0_dir, argv0_dir)
     sys.exit(2)
 
 if __name__ == "__main__":
-    if len(sys.argv) > 2:
+    if len(sys.argv) > 3 or len(sys.argv) == 1 or '-h' in sys.argv or '--help' in sys.argv:
         usage()
-    if len(sys.argv) > 1:
-        if sys.argv[1] in ('-h', '--help'):
-            usage()
-        conf_file = sys.argv[1]
+    if len(sys.argv) == 3:
+        mode = sys.argv[1]
+        conf_file = sys.argv[2]
         dev = True
     else:
+        mode = sys.argv[1]
         conf_file = os.path.join(base_dir, 'main.conf')
 
@@ -40 +44 @@
         }
 
-    if os.path.basename(sys.argv[0]).startswith('auth'):
+    if mode.startswith('auth'):
         root = main.InvirtWeb()
-    elif os.path.basename(sys.argv[0]).startswith('unauth'):
+        app_config['/']['tools.mako.module_directory'] = "/tmp/invirt-auth-web-templatecache"
+    elif mode.startswith('unauth'):
         root = main.InvirtUnauthWeb()
+        app_config['/']['tools.mako.module_directory'] = "/tmp/invirt-unauth-web-templatecache"
     else:
         usage()

package_branches/invirt-web/cherrypy-rebased/code/main.conf

@@ -3 +3 @@
 #auto_reload doesn't work with FastCGI
 engine.auto_reload = False
-tools.mako.module_directory = "/tmp/invirt-web-templatecache"
 tools.remote_user_login.on = True