Ignore:
Timestamp:
22 Feb 2014, 20:12:28 (11 years ago)
Author:
uli
Message:

Merge changes from henrik-diazo-themed.

Location:
main/kofacustom.ekodisco/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/kofacustom.ekodisco/trunk

  • main/kofacustom.ekodisco/trunk/buildout-zeo.cfg

    r10770 r11278  
    1313    site_zcml
    1414    zdaemon_conf
    15     deploy_ini
    16     debug_ini
     15    raw_deploy_ini
     16    raw_debug_ini
     17    themed_deploy_ini
     18    themed_debug_ini
    1719    profile_ini
    1820    zeo1_ini
     
    2325# kofactl creation must be _after_ app!
    2426    kofactl
     27    lxml
     28    diazo
    2529# For backward compatibility, telling buildout not to throw away
    2630# the data and log subdirectories from the parts directory.
     
    9397[zeo1_ini]
    9498recipe = collective.recipe.template
    95 input = etc/zeo1.ini.in
    96 output = ${buildout:parts-directory}/etc/zeo1.ini
     99input = etc/themed/zeo1.ini.in
     100output = ${buildout:parts-directory}/etc/themed-zeo1.ini
    97101
    98102[zeo2_ini]
    99103recipe = collective.recipe.template
    100 input = etc/zeo2.ini.in
    101 output = ${buildout:parts-directory}/etc/zeo2.ini
     104input = etc/themed/zeo2.ini.in
     105output = ${buildout:parts-directory}/etc/themed-zeo2.ini
    102106
    103107[zeo1_conf]
     
    115119# See http://pypi.python.org/pypi/zc.recipe.egg for details...
    116120recipe = zc.recipe.egg
    117 eggs = kofacustom.ekodisco [beaker]
     121eggs = kofacustom.ekodisco [beaker, diazo]
    118122arguments = "${buildout:parts-directory}/etc/zeo1.conf"
    119123scripts = kofactl=zeo_client1
     
    122126# See http://pypi.python.org/pypi/zc.recipe.egg for details...
    123127recipe = zc.recipe.egg
    124 eggs = kofacustom.ekodisco [beaker]
     128eggs = kofacustom.ekodisco [beaker, diazo]
    125129arguments = "${buildout:parts-directory}/etc/zeo2.conf"
    126130scripts = kofactl=zeo_client2
Note: See TracChangeset for help on using the changeset viewer.