--- a/{{cookiecutter.project_slug}}/etc/development.ini Sun Nov 26 09:29:21 2017 +0100
+++ b/{{cookiecutter.project_slug}}/etc/development.ini Sun Jan 14 12:27:43 2018 +0100
@@ -16,6 +16,7 @@
pyramid_fanstatic
pyramid_zodbconn
pyramid_tm
+ pyramid_retry
{%- if cookiecutter.use_elasticsearch %}
pyramid_es
{%- endif %}
@@ -58,8 +59,8 @@
{{ cookiecutter.extension_package }}
{%- endif %}
-tm.attempts = 3
-zodbconn.uri = zconfig://%(here)s/zodb-zeo.conf
+retry.attempts = 3
+zodbconn.uri = zconfig://%(here)s/zodb-{{ cookiecutter.db_type }}.conf
# By default, the toolbar only appears for clients from IP addresses
# '127.0.0.1' and '::1'.
@@ -99,7 +100,7 @@
beaker.cache.default.expire = 300
beaker.cache.long.expire = 3600
beaker.cache.persistent.expire = 604800
-beaker.cache.viws.expire = 300
+beaker.cache.views.expire = 300
{%- if cookiecutter.beaker_backend == 'redis' %}
beaker.cache.short.db = 2
beaker.cache.default.db = 3
@@ -120,8 +121,14 @@
# PyAMS ØMQ TCP handlers
pyams_scheduler.tcp_handler = {{ cookiecutter.pyams_scheduler }}
+pyams_scheduler.start_handler = {{ cookiecutter.start_scheduler }}
+
pyams_media.tcp_handler = {{ cookiecutter.pyams_medias_converter }}
+pyams_media.start_handler = {{ cookiecutter.start_medias_converter }}
+
pyams_content.es.tcp_handler = {{ cookiecutter.pyams_es_indexer }}
+pyams_content.es.start_handler = {{ cookiecutter.start_es_indexer }}
+
pyams_notify.tcp_handler = {{ cookiecutter.pyams_ws_notify }}
pyams_notify_ws.cache_server = {{ cookiecutter.beaker_backend }}://{{ cookiecutter.beaker_server }}
@@ -131,11 +138,18 @@
pyams_content.config.tools_name = tools
+# Set factory to 'NONE' or '--' to disable tool registration
+pyams_content.config.views_tool_factory = pyams_content.shared.view.manager.ViewsManager
+pyams_content.config.views_tool_name = views
+
pyams_content.config.news_tool_factory = pyams_content.shared.news.manager.NewsManager
pyams_content.config.news_tool_name = news
pyams_content.config.imagemaps_tool_factory = pyams_content.shared.imagemaps.manager.ImageMapsManager
-pyams_content.config.imagemaps_tool_name = news
+pyams_content.config.imagemaps_tool_name = imgmaps
+
+pyams_content.config.forms_tool_factory = pyams_content.shared.form.manager.FormsManager
+pyams_content.config.forms_tool_name = forms
###
--- a/{{cookiecutter.project_slug}}/etc/production.ini Sun Nov 26 09:29:21 2017 +0100
+++ b/{{cookiecutter.project_slug}}/etc/production.ini Sun Jan 14 12:27:43 2018 +0100
@@ -15,6 +15,7 @@
pyramid_fanstatic
pyramid_zodbconn
pyramid_tm
+ pyramid_retry
{%- if cookiecutter.use_elasticsearch %}
pyramid_es
{%- endif %}
@@ -57,9 +58,10 @@
{{ cookiecutter.extension_package }}
{%- endif %}
-tm.attempts = 3
-zodbconn.uri = zconfig://%(here)s/zodb-zeo.conf
+retry.attempts = 3
+zodbconn.uri = zconfig://%(here)s/zodb-{{ cookiecutter.db_type }}.conf
+# fanstatic settings
fanstatic.use_application_uri = true
fanstatic.publisher_signature = --static--
fanstatic.versioning = true
@@ -114,8 +116,14 @@
# PyAMS ØMQ TCP handlers
pyams_scheduler.tcp_handler = {{ cookiecutter.pyams_scheduler }}
+pyams_scheduler.start_handler = {{ cookiecutter.start_scheduler }}
+
pyams_media.tcp_handler = {{ cookiecutter.pyams_medias_converter }}
+pyams_media.start_handler = {{ cookiecutter.start_medias_converter }}
+
pyams_content.es.tcp_handler = {{ cookiecutter.pyams_es_indexer }}
+pyams_content.es.start_handler = {{ cookiecutter.start_es_indexer }}
+
pyams_notify.tcp_handler = {{ cookiecutter.pyams_ws_notify }}
pyams_notify_ws.cache_server = {{ cookiecutter.beaker_backend }}://{{ cookiecutter.beaker_server }}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/{{cookiecutter.project_slug}}/etc/zodb-newt.conf Sun Jan 14 12:27:43 2018 +0100
@@ -0,0 +1,17 @@
+%import relstorage
+
+<zodb>
+ <relstorage>
+ keep-history false
+ blob-dir {{ cookiecutter.blobs_dir }}
+ blob-cache-size 10GB
+ shared-blob-dir no
+ <newt>
+ <postgresql>
+ dsn host='{{ cookiecutter.db_host }}' port='{{ cookiecutter.db_port }}' dbname='{{ cookiecutter.db_name }}' user='{{ cookiecutter.db_username }}' password='{{ cookiecutter.db_password }}'
+ </postgresql>
+ </newt>
+ </relstorage>
+
+ cache-size 20000
+</zodb>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/{{cookiecutter.project_slug}}/etc/zodb-relstorage.conf Sun Jan 14 12:27:43 2018 +0100
@@ -0,0 +1,15 @@
+%import relstorage
+
+<zodb>
+ <relstorage>
+ keep-history false
+ blob-dir {{ cookiecutter.blobs_dir }}
+ blob-cache-size 10GB
+ shared-blob-dir no
+ <postgresql>
+ dsn host='{{ cookiecutter.db_host }}' port='{{ cookiecutter.db_port }}' dbname='{{ cookiecutter.db_name }}' user='{{ cookiecutter.db_username }}' password='{{ cookiecutter.db_password }}'
+ </postgresql>
+ </relstorage>
+
+ cache-size 20000
+</zodb>
--- a/{{cookiecutter.project_slug}}/etc/zodb-zeo.conf Sun Nov 26 09:29:21 2017 +0100
+++ b/{{cookiecutter.project_slug}}/etc/zodb-zeo.conf Sun Jan 14 12:27:43 2018 +0100
@@ -1,16 +1,16 @@
<zodb>
<zeoclient>
- server {{ cookiecutter.zeo_server }}
- storage {{ cookiecutter.zeo_storage }}
-{%- if cookiecutter.zeo_username and cookiecutter.zeo_password %}
- username {{ cookiecutter.zeo_username }}
- password {{ cookiecutter.zeo_password }}
+ server {{ cookiecutter.db_host }}:{{ cookiecutter.db_port }}
+ storage {{ cookiecutter.db_name }}
+{%- if cookiecutter.db_username and cookiecutter.db_password %}
+ username {{ cookiecutter.db_username }}
+ password {{ cookiecutter.db_password }}
realm {{ cookiecutter.zeo_realm }}
{%- endif %}
var $((INSTALL))/var
- blob-dir $((INSTALL))/var/db/blobs
- blob-cache-size 1GB
- shared-blob-dir yes
+ blob-dir {{ cookiecutter.blobs_dir }}
+ blob-cache-size 10GB
+ shared-blob-dir no
</zeoclient>
cache-size 20000