[Plone-cvs] r39357 - in Products.PloneOrg/trunk: conf templates

[David G. <svn...@pl...>]

Author: davisagli
Date: Sat Aug 28 23:02:17 2010
New Revision: 39357

Modified:
   Products.PloneOrg/trunk/conf/staging.cfg
   Products.PloneOrg/trunk/conf/xdv.cfg
   Products.PloneOrg/trunk/templates/plone.org.conf.in
Log:
install xdvcompiler script; fix where the xdv conf gets put; fix paths in plone.org.conf.in

Modified: Products.PloneOrg/trunk/conf/staging.cfg
==============================================================================
--- Products.PloneOrg/trunk/conf/staging.cfg	(original)
+++ Products.PloneOrg/trunk/conf/staging.cfg	Sat Aug 28 23:02:17 2010
@@ -13,8 +13,8 @@
     instance
     zopepy
     omelette
-    bootstrap
 
+    xdv
     default.xsl
     wide.xsl
     nginx
@@ -24,6 +24,10 @@
 eggs +=
     xdv
 
+[xdv]
+recipe = zc.recipe.egg
+eggs = xdv
+
 [instance]
 eggs += plone.app.ldap
 http-address = 5011

Modified: Products.PloneOrg/trunk/conf/xdv.cfg
==============================================================================
--- Products.PloneOrg/trunk/conf/xdv.cfg	(original)
+++ Products.PloneOrg/trunk/conf/xdv.cfg	Sat Aug 28 23:02:17 2010
@@ -5,7 +5,7 @@
 recipe = zc.recipe.cmmi
 url = http://html-xslt.googlecode.com/files/nginx-0.7.67-html-xslt-4.tar.gz 
 extra_options =
-    --conf-path=../etc/nginx.conf
+    --conf-path=../../etc/nginx.conf
     --error-log-path=../var/log/nginx-error.log
     --http-log-path=../var/log/nginx-access.log
     --pid-path=../var/nginx.pid

Modified: Products.PloneOrg/trunk/templates/plone.org.conf.in
==============================================================================
--- Products.PloneOrg/trunk/templates/plone.org.conf.in	(original)
+++ Products.PloneOrg/trunk/templates/plone.org.conf.in	Sat Aug 28 23:02:17 2010
@@ -4,7 +4,7 @@
     server {
         listen ${listen};
         server_name ${server_name};
-        root ${buildout:directory}/static; 
+        root ${buildout:directory}/../static; 
 
         location = /nginx-status {
             stub_status on;
@@ -33,7 +33,7 @@
             proxy_pass http://backend;
             proxy_set_header Host $host;
             proxy_set_header X-XDV "true";
-            xslt_stylesheet ${buildout:directory}/etc/default.xsl;
+            xslt_stylesheet ${buildout:directory}/../etc/default.xsl;
             xslt_html_parser on;
             xslt_types text/html;
         }
@@ -42,7 +42,7 @@
             proxy_pass http://backend;
             proxy_set_header Host $host;
             proxy_set_header X-XDV "true";
-            xslt_stylesheet ${buildout:directory}/etc/wide.xsl;
+            xslt_stylesheet ${buildout:directory}/../etc/wide.xsl;
             xslt_html_parser on;
             xslt_types text/html;
         }
@@ -51,7 +51,7 @@
             proxy_pass http://backend;
             proxy_set_header Host $host;
             proxy_set_header X-XDV "true";
-            xslt_stylesheet ${buildout:directory}/etc/wide.xsl;
+            xslt_stylesheet ${buildout:directory}/../etc/wide.xsl;
             xslt_html_parser on;
             xslt_types text/html;
         }
@@ -71,7 +71,7 @@
     server {
         listen ${listen};
         server_name ${manage-server_name};
-        root ${buildout:directory}/static;
+        root ${buildout:directory}/../static;
 
         location = /nginx-status {
             stub_status on;