Simplify profiles.

software/erp5/instance.cfg

@@ -64,8 +64,8 @@ offline = true
 [dynamic-template-tidstorage]
 recipe = slapos.cookbook:generate.erp5.tidstorage
 snippet-zeo = ${template-snippet-zeo:output}
-snippet-zope = ${template-snippet-zope-zeo-master:output}
-snippet-zope-zeo = ${template-snippet-zope:output}
+snippet-zope = ${template-snippet-zope:output}
+snippet-zope-zeo = ${template-snippet-zope-zeo-master:output}
 
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype

software/erp5/snippet-zope-zeo-master.cfg

@@ -27,10 +27,6 @@ cronoutput = $${basedirectory:log}/cron/
 logrotate-backup = $${basedirectory:backup}/logrotate/
 logrotate-entries = $${rootdirectory:etc}/logrotate.d/
 
-[publish-memcached-connection-information]
-recipe = slapos.cookbook:publishurl
-url = zeo://$${zeo-instance:ip}:$${zeo-instance:port}/
-
 [cron]
 recipe = slapos.cookbook:cron
 dcrond-binary = ${dcron:location}/sbin/crond
@@ -101,3 +97,41 @@ certs = $${directory:ca-dir}/certs/
 newcerts = $${directory:ca-dir}/newcerts/
 crl = $${directory:ca-dir}/crl/
 
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+tmp = $${buildout:directory}/tmp/
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log/
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+backup = $${rootdirectory:srv}/backup/
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+zodb = $${rootdirectory:srv}/zodb/
+instance = $${rootdirectory:srv}/erp5shared/
+instance-etc = $${:instance}/etc
+apache-conf = $${rootdirectory:etc}/apache
+instance-etc-package-include = $${:instance}/etc/package-include
+# because of bug in slapos.recipe.template keys are lowercased
+instance-document = $${:instance}/Document
+instance-propertysheet = $${:instance}/PropertySheet
+instance-products = $${:instance}/Products
+instance-extensions = $${:instance}/Extensions
+instance-constraint = $${:instance}/Constraint
+instance-import = $${:instance}/import
+instance-lib = $${:instance}/lib
+instance-tests = $${:instance}/tests
+ca-dir = $${rootdirectory:srv}/ssl/
+cron-entries = $${rootdirectory:etc}/cron.d/
+crontabs = $${rootdirectory:etc}/crontabs/
+cronstamps = $${rootdirectory:etc}/cronstamps/
+cronoutput = $${basedirectory:log}/cron/
+logrotate-backup = $${basedirectory:backup}/logrotate/
+logrotate-entries = $${rootdirectory:etc}/logrotate.d/

software/erp5/snippet-zope.cfg

@@ -66,19 +66,6 @@ inituser = $${:instance-path}/inituser
 # Binary information
 runzope-binary = ${buildout:bin-directory}/runzope
 
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = $${buildout:gzip-binary}
-gunzip-binary = ${gzip:location}/bin/gunzip
-# Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
-
 [logrotate-entry-zope]
 <= logrotate
 recipe = slapos.cookbook:logrotate.d
@@ -102,64 +89,3 @@ post = ${buildout:bin-directory}/killpidfromfile $${apache-zope-backend-instance
 sharedscripts = true
 notifempty = true
 create = true
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:binary}
-binary = $${basedirectory:services}/crond
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-binary = $${rootdirectory:bin}/cron_simplelogger
-output = $${directory:cronoutput}
-
-[cron-entry-logrotate]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-frequency = 0 0 * * *
-command = $${logrotate:wrapper}
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc/
-var = $${buildout:directory}/var/
-srv = $${buildout:directory}/srv/
-bin = $${buildout:directory}/bin/
-tmp = $${buildout:directory}/tmp/
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log/
-services = $${rootdirectory:etc}/run/
-run = $${rootdirectory:var}/run/
-backup = $${rootdirectory:srv}/backup/
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-zodb = $${rootdirectory:srv}/zodb/
-instance = $${rootdirectory:srv}/erp5shared/
-instance-etc = $${:instance}/etc
-apache-conf = $${rootdirectory:etc}/apache
-instance-etc-package-include = $${:instance}/etc/package-include
-# because of bug in slapos.recipe.template keys are lowercased
-instance-document = $${:instance}/Document
-instance-propertysheet = $${:instance}/PropertySheet
-instance-products = $${:instance}/Products
-instance-extensions = $${:instance}/Extensions
-instance-constraint = $${:instance}/Constraint
-instance-import = $${:instance}/import
-instance-lib = $${:instance}/lib
-instance-tests = $${:instance}/tests
-ca-dir = $${rootdirectory:srv}/ssl/
-cron-entries = $${rootdirectory:etc}/cron.d/
-crontabs = $${rootdirectory:etc}/crontabs/
-cronstamps = $${rootdirectory:etc}/cronstamps/
-cronoutput = $${basedirectory:log}/cron/
-logrotate-backup = $${basedirectory:backup}/logrotate/
-logrotate-entries = $${rootdirectory:etc}/logrotate.d/
-

software/erp5/software.cfg

@@ -68,7 +68,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = df533e2f34e443efe8a94fe04fbf8e6f
+md5sum = 126b38ab51808fb858eae3fc3f065a63
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -96,14 +96,14 @@ mode = 0644
 [template-snippet-zope-zeo-master]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/snippet-zope-zeo-master.cfg
-md5sum = 7596aa311c1187b05197e3b44b41727b
+md5sum = fc7292e30c354df93660d18cd59c0b14
 output = ${buildout:directory}/template-snippet-zope-zeo-master.cfg
 mode = 0644
 
 [template-snippet-zope]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/snippet-zope.cfg
-md5sum = e903614e27b384c330f76e77a99b831f
+md5sum = 59c1e3bb38147fff723f9c8bbd9e86bb
 output = ${buildout:directory}/template-snippet-zope.cfg
 mode = 0644