[z3-checkins] r53637 - z3/deliverance/DeliveranceVHoster/trunk

[slinkp at codespeak.net]

Author: slinkp
Date: Thu Apr 10 01:01:54 2008
New Revision: 53637

Modified:
   z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl
Log:
work in progress toward making TOPP's deliverance themes work out-of-the-box.


Modified: z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl
==============================================================================
--- z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl	(original)
+++ z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl	Thu Apr 10 01:01:54 2008
@@ -28,10 +28,11 @@
 #   (note: this matches the *environmental key*, not the original header)
 clean_environ_headers_regex = ^HTTP_X_OPENPLANS
 
-# This makes every site like the "master" www.openplans.org site,
-# hosting multiple projects.  If you set it to a specific domain, then
-# any other domains will be treated as project vhosts:
-master_site_domain = auto
+# master_site_domain = "auto" makes every site like the "master"
+# www.openplans.org site, hosting multiple projects.  If you set it to
+# a specific domain, then any other domains will be treated as project
+# vhosts:
+master_site_domain = {{project.req_settings.get('master_site_domain', 'auto'}}
 
 
 # WARNING: *THE LINE BELOW MUST BE FALSE ON A PRODUCTION ENVIRONMENT*
@@ -68,6 +69,12 @@
 transcluder_ok_hosts = openplans.org|(.*)\.openplans.org|(.*)\.localhost.openplans\.org|localhost|127.0.0.1
 transcluder_pool_size = 0
 
-default_theme_uri = {{project.req_settings.get('default_theme_uri', 'http://www.openplans.org/theme.html')}}
+# Where to load the default theme.  
+# Note re. the defaults: fassembler tries to get this setting from the
+# project's requirements file; if it's not set there, fassembler
+# assumes deliverance is the outermost server in your stack so the
+# theme can be requested from deliverance itself.
+# This is at least better than the old fallback of hitting openplans.org.
+default_theme_uri = {{project.req_settings.get('default_theme_uri', 'http://localhost:%d/theme.html' % env.base_port)}}
 
 topp_secret_filename = {{env.config.get('general', 'topp_secret_filename')}}