From 28c0726ebc78c2de3d80a1d7faaa3c1179198b68 Mon Sep 17 00:00:00 2001
From: Stephan Geulette <s.geulette@imio.be>
Date: Sat, 3 Sep 2022 09:43:40 +0200
Subject: [PATCH] Removed decorate_acl_methods from instance-debug to avoid
 ZODB.POSException.ConflictError in migration

---
 base.cfg | 1 -
 prod.cfg | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/base.cfg b/base.cfg
index abacfc1..d630966 100755
--- a/base.cfg
+++ b/base.cfg
@@ -69,7 +69,6 @@ zope-conf-additional =
 environment-vars =
   PYTHON_EGG_CACHE ${buildout:directory}/python-eggs
   zope_i18n_compile_mo_files true
-#  ENABLE_PRINTING_MAILHOST True
   OO_PORT ${port:oo-port}
   PYTHON_UNO ${port:python-uno}
   PUBLIC_URL ${port:public-url}
diff --git a/prod.cfg b/prod.cfg
index 170956d..1aef2ec 100644
--- a/prod.cfg
+++ b/prod.cfg
@@ -79,6 +79,7 @@ environment-vars +=
   zope_i18n_allowed_languages fr en
   PTS_LANGUAGES fr en
   ZC_ASYNC_UUID ${buildout:directory}/var/uuid-instance.txt
+#  ENABLE_PRINTING_MAILHOST True
 
 [instance2]
 <= instance1
@@ -125,6 +126,8 @@ zope-conf-additional =
   </product-config>
   ${zope-conf:additional}
   publisher-profile-file ${buildout:directory}/profile.dat
+environment-vars -=
+  decorate_acl_methods true
 
 [instance-amqp]
 <= instance1
@@ -143,6 +146,8 @@ zope-conf-additional =
   </product-config>
   ${zope-conf:additional}
   ${zope-conf:amqp}
+environment-vars -=
+  decorate_acl_methods true
 
 [instance-async]
 <= instance1