Changeset 8773

Timestamp:

21 Jun 2012, 05:49:59 (12 years ago)

Author:

Henrik Bettermann

Message:

Set main parameters in one buildout section.

Location:

main

Files:

• waeup.futminna/trunk/buildout-zeo.cfg (modified) (1 diff)
• waeup.futminna/trunk/buildout.cfg (modified) (1 diff)
• waeup.futminna/trunk/etc/debug.ini.in (modified) (1 diff)
• waeup.futminna/trunk/etc/deploy.ini.in (modified) (1 diff)
• waeup.futminna/trunk/etc/profile.ini.in (modified) (1 diff)
• waeup.futminna/trunk/etc/zeo1.ini.in (modified) (1 diff)
• waeup.futminna/trunk/etc/zeo2.ini.in (modified) (1 diff)
• waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py (modified) (2 diffs)
• waeup.kofa/trunk/src/waeup/kofa/applicants/root.py (modified) (1 diff)

main/waeup.futminna/trunk/buildout-zeo.cfg

@@ -42 +42 @@
 zeo.conf =
   <zeo>
-    address 7010
+    address ${kofa_params:server_port}
   </zeo>
   <blobstorage 1>

main/waeup.futminna/trunk/buildout.cfg

@@ -30 +30 @@
 # (see .buildout/default.cfg in your home directory)
 # unless you specify an eggs-directory option here.
+
+[kofa_params]
+## Basic parameters for deployment.
+# default is 127.0.0.1
+host = 0.0.0.0
+# default is 8080
+base_port = 7041
+zeo1_port = 7041
+zeo2_port = 7042
+zeo3_port = 7043
+server_port = 7040
+# default 7. Number of pre-opened ZODB threads/client
+pool_size = 7
+# default 20MB. Cache size of each client (ZEO only)
+client_cache = 20MB
+# default 5000. Number of objects cached.
+object_cache = 5000
+# number of preopened paster threads, default 10
+threadpool_workers = 10
 
 [app]

main/waeup.futminna/trunk/etc/debug.ini.in

@@ -60 +60 @@
 [server:main]
 use = egg:Paste#http
-host = 0.0.0.0
-port = 8080
+host = ${kofa_params:host}
+port = ${kofa_params:base_port}
 
 [DEFAULT]

main/waeup.futminna/trunk/etc/deploy.ini.in

@@ -53 +53 @@
 [server:main]
 use = egg:Paste#http
-host = 0.0.0.0
-port = 7041
+host = ${kofa_params:host}
+port = ${kofa_params:base_port}
 
 [DEFAULT]

main/waeup.futminna/trunk/etc/profile.ini.in

@@ -59 +59 @@
 [server:main]
 use = egg:Paste#http
-host = 0.0.0.0
-port = 8080
+host = ${kofa_params:host}
+port = ${kofa_params:base_port}
 
 [DEFAULT]

main/waeup.futminna/trunk/etc/zeo1.ini.in

@@ -53 +53 @@
 [server:main]
 use = egg:Paste#http
-host = 0.0.0.0
-port = 7041
-threadpool_workers = 50
+host = ${kofa_params:host}
+port = ${kofa_params:zeo1_port}
+threadpool_workers = ${kofa_params:threadpool_workers}
 use_threadpool = True
 

main/waeup.futminna/trunk/etc/zeo2.ini.in

@@ -53 +53 @@
 [server:main]
 use = egg:Paste#http
-host = 0.0.0.0
-port = 7042
-threadpool_workers = 50
+host = ${kofa_params:host}
+port = ${kofa_params:zeo2_port}
+threadpool_workers = ${kofa_params:threadpool_workers}
 use_threadpool = True
 

main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py

@@ -119 +119 @@
         return appcats_dict[value][0]
 
-# Maybe Uniben still needs this ...
+# Maybe FUTMinna still needs this ...
 #class ApplicationPinSource(BasicContextualSourceFactory):
 #    """An application pin source delivers PIN prefixes for application
@@ -203 +203 @@
         )
 
-    # Maybe Uniben still needs this ...
+    # Maybe FUTMinna still needs this ...
     #ac_prefix = schema.Choice(
     #    title = u'Activation code prefix',

main/waeup.kofa/trunk/src/waeup/kofa/applicants/root.py

@@ -86 +86 @@
             #        logger.info(
             #            '%s: %s added to root.' % (self.log_prefix,i[0]))
-            # can be removed after upgrading uniben
+            # can be removed after upgrading futminna
             #if not hasattr(app_folder, 'description_dict'):
             #    nothing_to_do = False