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

Merge changes from henrik-diazo-themed back into trunk.

Location:
main/waeup.fceokene/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.fceokene/trunk

  • main/waeup.fceokene/trunk/buildout.cfg

    r11212 r11297  
    1818    site_zcml
    1919    zdaemon_conf
    20     deploy_ini
    21     debug_ini
     20    raw_deploy_ini
     21    raw_debug_ini
     22    themed_deploy_ini
     23    themed_debug_ini
    2224    profile_ini
    2325    waeupdocs
     
    2628# kofactl creation must be _after_ app!
    2729    kofactl
     30    lxml
     31    diazo
    2832# For backward compatibility, telling buildout not to throw away
    2933# the data and log subdirectories from the parts directory.
     
    4145
    4246[sources]
    43 waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/tags/0.2.1
    44 kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/tags/0.1
     47waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/branches/uli-diazo-themed
     48kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/trunk
    4549
    4650[kofa_params]
     
    5256zeo1_port = 7031
    5357zeo2_port = 7032
    54 zeo3_port = 7033
     58# zeo3_port = 7033
    5559server_port = 7030
    5660# default 7. Number of pre-opened ZODB threads/client
     
    6266# number of preopened paster threads, default 10
    6367threadpool_workers = 10
     68devel_pkg = waeup.fceokene
    6469
    6570[app]
    6671# This creates all scripts in bin/. The kofactl created here is 'faulty'.
    6772recipe = zc.recipe.egg
    68 eggs = waeup.fceokene [beaker]
     73eggs = waeup.fceokene [beaker, diazo]
    6974       z3c.evalexception>=2.0
    7075       Paste
     
    8085# fixed path to zdaemon.conf as argument.
    8186recipe = zc.recipe.egg
    82 eggs = waeup.fceokene [beaker]
     87eggs = waeup.fceokene [beaker, diazo]
    8388arguments = "${buildout:parts-directory}/etc/zdaemon.conf"
    8489scripts = kofactl=kofactl
     
    146151output = ${buildout:parts-directory}/etc/zdaemon.conf
    147152
    148 [deploy_ini]
    149 recipe = collective.recipe.template
    150 input = etc/deploy.ini.in
    151 output = ${buildout:parts-directory}/etc/deploy.ini
    152 
    153 [debug_ini]
    154 recipe = collective.recipe.template
    155 input = etc/debug.ini.in
    156 output = ${buildout:parts-directory}/etc/debug.ini
     153[raw_debug_ini]
     154recipe = collective.recipe.template
     155input = etc/raw/debug.ini.in
     156output = ${buildout:parts-directory}/etc/raw-debug.ini
     157
     158[raw_deploy_ini]
     159recipe = collective.recipe.template
     160input = etc/raw/deploy.ini.in
     161output = ${buildout:parts-directory}/etc/raw-deploy.ini
     162
     163[themed_debug_ini]
     164recipe = collective.recipe.template
     165input = etc/themed/debug.ini.in
     166output = ${buildout:parts-directory}/etc/themed-debug.ini
     167
     168[themed_deploy_ini]
     169recipe = collective.recipe.template
     170input = etc/themed/deploy.ini.in
     171output = ${buildout:parts-directory}/etc/themed-deploy.ini
    157172
    158173[profile_ini]
     
    186201scripts = coveragereport
    187202arguments = ('${buildout:parts-directory}/coverage-detect/working-directory/coverage', '${buildout:directory}/coverage-report')
     203
     204[lxml]
     205recipe = z3c.recipe.staticlxml
     206egg = lxml
     207
     208[diazo]
     209recipe = zc.recipe.egg
     210eggs =
     211    diazo [wsgi]
     212    PasteScript
     213    waeup.fceokene [beaker, diazo]
Note: See TracChangeset for help on using the changeset viewer.