Ignore:
Timestamp:
22 Feb 2014, 21:16:30 (11 years ago)
Author:
uli
Message:

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

Location:
main/waeup.imostate/trunk
Files:
6 edited
8 copied

Legend:

Unmodified
Added
Removed

  • main/waeup.imostate/trunk

  • main/waeup.imostate/trunk/etc/zdaemon.conf.in

    r10340 r11309  
    11<runner>
    2   program ${buildout:directory}/bin/paster serve ${buildout:directory}/parts/etc/deploy.ini
     2  program ${buildout:directory}/bin/paster serve ${buildout:directory}/parts/etc/themed-deploy.ini
    33  daemon on
    44  transcript ${zope_conf:logfiles}/zdaemon.log

  • main/waeup.imostate/trunk/etc/zeo1.conf.in

    r10340 r11309  
    11<runner>
    2   program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo1.pid ${buildout:directory}/parts/etc/zeo1.ini
     2  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo1.pid ${buildout:directory}/parts/etc/themed-zeo1.ini
    33  daemon on
    44  transcript ${zope_conf:logfiles}/zdaemon-zeo1.log
    55  socket-name ${zope_conf:logfiles}/zeo1.sock
    66  # Enable this to run the child process as a different user
    7   user kofa
     7  # user kofa
    88</runner>

  • main/waeup.imostate/trunk/etc/zeo2.conf.in

    r10340 r11309  
    11<runner>
    2   program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/zeo2.ini
     2  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/themed-zeo2.ini
    33  daemon on
    44  transcript ${zope_conf:logfiles}/zdaemon-zeo2.log
    55  socket-name ${zope_conf:logfiles}/zeo2.sock
    66  # Enable this to run the child process as a different user
    7   user kofa
     7  # user kofa
    88</runner>

  • main/waeup.imostate/trunk/etc/zope_zeo1.conf.in

    r10340 r11309  
    2424# Uncomment this if you want to connect to a ZEO server instead:
    2525  <zeoclient>
    26     server localhost:7040
     26    server localhost:7070
    2727    storage 1
    2828    # ZEO client cache, in bytes
    … …  
    6464<zodb async>
    6565  <zeoclient>
    66     server localhost:7040
     66    server localhost:7070
    6767    storage async
    6868    name async

  • main/waeup.imostate/trunk/etc/zope_zeo2.conf.in

    r10340 r11309  
    2424# Uncomment this if you want to connect to a ZEO server instead:
    2525  <zeoclient>
    26     server localhost:7040
     26    server localhost:7070
    2727    storage 1
    2828    # ZEO client cache, in bytes
    … …  
    6464<zodb async>
    6565  <zeoclient>
    66     server localhost:7040
     66    server localhost:7070
    6767    storage async
    6868    name async
Note: See TracChangeset for help on using the changeset viewer.