Ignore:
Timestamp:
Dec 20, 2009, 8:26:02 PM (15 years ago)
Author:
price
Message:

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".

File:
1 copied

Legend:

Unmodified
Added
Removed
  • package_branches/invirt-web/cherrypy/code/invirt.fcgi

    • Property svn:executable deleted
    r2654 r2655  
    11#!/usr/bin/python
    2 """Main FastCGI entry point for unauthenticated web interface"""
     2"""Main FastCGI entry point for web interface"""
    33
    44import cherrypy
    55import os
    66import sys
    7 from main import InvirtUnauthWeb
     7
     8import main
    89
    910dev = False
     
    1617
    1718With `config`, run standalone with CherryPy config from `config`.
     19
     20Run this script as either 'auth.fcgi' or 'unauth.fcgi', to get
     21the authenticated or unauthenticated site respectively.
    1822""" % sys.argv[0]
    1923    sys.exit(2)
     
    3539            },
    3640        }
    37                    
    38     app = cherrypy.tree.mount(InvirtUnauthWeb(),
    39                               '/',
    40                               app_config)
     41
     42    if os.path.basename(sys.argv[0]).startswith('auth'):
     43        root = InvirtWeb()
     44    elif os.path.basename(sys.argv[0]).startswith('unauth'):
     45        root = InvirtUnauthWeb()
     46    else:
     47        usage()
     48
     49    app = cherrypy.tree.mount(root, '/', app_config)
    4150    app.merge(conf_file)
    4251    cherrypy.config.update(conf_file)
Note: See TracChangeset for help on using the changeset viewer.