Changeset 11152

Timestamp:

21 Feb 2014, 08:32:37 (11 years ago)

Author:

Henrik Bettermann

Message:

Put Diazo into ZEO pipeline.

Fix link to Interswitch logo.

Location:

main/waeup.aaua/branches/henrik-diazo-themed

Files:

• buildout-zeo.cfg (modified) (1 diff)
• buildout.cfg (modified) (1 diff)
• etc/themed/zeo1.ini.in (added)
• etc/themed/zeo2.ini.in (added)
• etc/zeo1.conf.in (modified) (1 diff)
• etc/zeo2.conf.in (modified) (1 diff)
• etc/zope_zeo1.conf.in (modified) (2 diffs)
• etc/zope_zeo2.conf.in (modified) (2 diffs)
• src/waeup/aaua/interswitch/browser_templates/student_goto_interswitch.pt (modified) (1 diff)
• versions.cfg (modified) (1 diff)

main/waeup.aaua/branches/henrik-diazo-themed/buildout-zeo.cfg

@@ -97 +97 @@
 [zeo1_ini]
 recipe = collective.recipe.template
-input = etc/zeo1.ini.in
-output = ${buildout:parts-directory}/etc/zeo1.ini
+input = etc/themed/zeo1.ini.in
+output = ${buildout:parts-directory}/etc/themed-zeo1.ini
 
 [zeo2_ini]
 recipe = collective.recipe.template
-input = etc/zeo2.ini.in
-output = ${buildout:parts-directory}/etc/zeo2.ini
+input = etc/themed/zeo2.ini.in
+output = ${buildout:parts-directory}/etc/themed-zeo2.ini
 
 [zeo1_conf]

main/waeup.aaua/branches/henrik-diazo-themed/buildout.cfg

@@ -56 +56 @@
 zeo1_port = 7061
 zeo2_port = 7062
-zeo3_port = 7063
+# zeo3_port = 7063
 server_port = 7060
 # default 7. Number of pre-opened ZODB threads/client

main/waeup.aaua/branches/henrik-diazo-themed/etc/zeo1.conf.in

@@ -1 +1 @@
 <runner>
-  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo1.pid ${buildout:directory}/parts/etc/zeo1.ini
+  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo1.pid ${buildout:directory}/parts/etc/themed-zeo1.ini
   daemon on
   transcript ${zope_conf:logfiles}/zdaemon-zeo1.log
   socket-name ${zope_conf:logfiles}/zeo1.sock
   # Enable this to run the child process as a different user
-  user kofa
+  # user kofa
 </runner>

main/waeup.aaua/branches/henrik-diazo-themed/etc/zeo2.conf.in

@@ -1 +1 @@
 <runner>
-  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/zeo2.ini
+  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/themed-zeo2.ini
   daemon on
   transcript ${zope_conf:logfiles}/zdaemon-zeo2.log
   socket-name ${zope_conf:logfiles}/zeo2.sock
   # Enable this to run the child process as a different user
-  user kofa
+  # user kofa
 </runner>

main/waeup.aaua/branches/henrik-diazo-themed/etc/zope_zeo1.conf.in

@@ -24 +24 @@
 # Uncomment this if you want to connect to a ZEO server instead:
   <zeoclient>
-    server localhost:7050
+    server localhost:7060
     storage 1
     # ZEO client cache, in bytes
@@ -63 +63 @@
 <zodb async>
   <zeoclient>
-    server localhost:7050
+    server localhost:7060
     storage async
     name async

main/waeup.aaua/branches/henrik-diazo-themed/etc/zope_zeo2.conf.in

@@ -24 +24 @@
 # Uncomment this if you want to connect to a ZEO server instead:
   <zeoclient>
-    server localhost:7050
+    server localhost:7060
     storage 1
     # ZEO client cache, in bytes
@@ -63 +63 @@
 <zodb async>
   <zeoclient>
-    server localhost:7050
+    server localhost:7060
     storage async
     name async

main/waeup.aaua/branches/henrik-diazo-themed/src/waeup/aaua/interswitch/browser_templates/student_goto_interswitch.pt

@@ -72 +72 @@
   <span tal:replace="structure view/xml_data"></span>
 
-  <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
+  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
 
   <br /><br />
 
-  <img tal:attributes="src view/interswitch_img_url" />
+  <img src="/static/img/interswitch_verve_mastercard.gif" />
 
 </form>

main/waeup.aaua/branches/henrik-diazo-themed/versions.cfg

@@ -147 +147 @@
 # z3c.recipe.staticlxml==0.10
 zc.recipe.cmmi = 1.3.5
+
+# Added by buildout at 2014-02-21 09:29:24.339382
+zc.zodbrecipes = 2.0.0