move standard recipe to base. use zeoserver in standard in prod

IMIO · Jan 30, 2014 · 6529419 · 6529419
1 parent 68455ef
commit 6529419
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/base.cfg b/base.cfg
@@ -123,3 +123,12 @@ scripts = ipython=ipzope
 recipe = zc.recipe.egg
 eggs = ZODB3
 scripts = repozo
+
+[standard]
+recipe = collective.recipe.plonesite
+site-id = standard
+instance = instance1
+default-language = fr
+profiles-initial = Products.CMFPlone:plone-content
+site-replace = false
+post-extras = standard-config.py
diff --git a/prod.cfg b/prod.cfg
@@ -87,3 +87,6 @@ zope-conf-additional =
   %define ZEOINSTANCE ${buildout:directory}/parts/zeoserver/var
   %define BLOBSTORAGE ${buildout:directory}/var/blobstorage
   %include ${buildout:directory}/zope_add_zeo.conf
+
+[standard]
+server = zeoserver
diff --git a/standard-config.cfg b/standard-config.cfg
@@ -8,15 +8,3 @@ parts +=
 [instance1]
 eggs +=
     collective.recipe.plonesite
-
-[versions]
-collective.recipe.plonesite = 1.8.2
-
-[standard]
-recipe = collective.recipe.plonesite
-site-id = standard
-instance = instance1
-default-language = fr
-profiles-initial = Products.CMFPlone:plone-content
-site-replace = false
-post-extras = standard-config.py