Cleanup the lamp stack

stack/lamp/buildout.cfg

@@ -76,21 +76,21 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
 output = ${buildout:directory}/template-mariadb.cfg
-md5sum = 13953fd1c6eeca15d00d9bd060903d12
+md5sum = 52237e8921b070d0de3bb2f6716d40c7
 mode = 0644
 
 [template-mariadb-remote-backuped]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb-remote-backuped.cfg
 output = ${buildout:directory}/template-mariadb-remote-backuped.cfg
-md5sum = fa4dae3a62ba2c42391c8275c632b848
+md5sum = 222bb187b5628536a20a809f3faf31f8
 mode = 0644
 
 [template-mariadb-pseudo-replicating]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb-pseudo-replicating.cfg
 output = ${buildout:directory}/template-mariadb-pseudo-replicating.cfg
-md5sum = d352b49500652bb64a44aae00d7678fd
+md5sum = e9f1d5f6dd5f7995d0be06863d196de9
 mode = 0644
 
 [eggs]

stack/lamp/instance-mariadb-pseudo-replicating.cfg

@@ -23,6 +23,7 @@ remote-backup = $${slap-parameter:backup-url}
 local-directory = $${directory:duplicity-recover}
 duplicity-binary = ${buildout:bin-directory}/duplicity
 wrapper = $${rootdirectory:bin}/raw_duplicity
+cache = $${directory:duplicity-cache}
 recover = true
 
 [duplicity-recover-locked]
@@ -51,15 +52,21 @@ wait = true
 
 [cron-entry-duplicity-recover]
 <= cron
+recipe = slapos.cookbook:cron.d
 name = duplicity_recover
-frequency = 0 0 * * *
+frequency = 30 * * * *
 command = $${duplicity-recover-locked:wrapper}
 
 [cron-entry-mariadb-import]
 <= cron
+recipe = slapos.cookbook:cron.d
 name = mariadb_import
-frequency = 0 1 * * *
+frequency = 0 * * * *
 command = $${mydumper-import-locked:wrapper}
 
+[basedirectory]
+cache = $${rootdirectory:var}/cache/
+
 [directory]
 duplicity-recover = $${rootdirectory:srv}/recovering
+duplicity-cache = $${basedirectory:cache}/duplicity

stack/lamp/instance-mariadb-remote-backuped.cfg

@@ -40,6 +40,7 @@ local-directory = $${mydumper:backup-directory}
 duplicity-binary = ${buildout:bin-directory}/duplicity
 wrapper = $${rootdirectory:bin}/raw_duplicity
 recover = false
+cache = $${directory:duplicity-cache}
 
 [duplicity-locked]
 recipe = slapos.cookbook:lockfile
@@ -52,15 +53,19 @@ wait = true
 <= cron
 recipe = slapos.cookbook:cron.d
 name = remote_backup
-frequency = 0 1 * * *
+frequency = 30 * * * *
 command = $${duplicity-locked:wrapper}
 
 [cron-entry-mariadb-backup]
 <= cron
 recipe = slapos.cookbook:cron.d
 name = backup
-frequency = 0 0 * * *
+frequency = 0 * * * *
 command = $${mydumper-locked:wrapper}
 
+[basedirectory]
+cache = $${rootdirectory:var}/cache/
+
 [directory]
 mariadb-backup = $${basedirectory:backup}/mariadb/
+duplicity-cache = $${basedirectory:cache}/duplicity/

stack/lamp/instance-mariadb.cfg

@@ -44,7 +44,6 @@ data-directory = $${directory:mariadb-data}
 pid-file = $${basedirectory:run}/mariadb.pid
 socket = $${basedirectory:run}/mariadb.sock
 error-log = $${basedirectory:log}/mariadb_error.log
-slow-query-log = $${basedirectory:log}/mariadb_slowquery.log
 conf-file = $${rootdirectory:etc}/mariadb.cnf
 promise = $${basedirectory:promises}/mysql
 
@@ -114,7 +113,7 @@ state-file = $${rootdirectory:srv}/logrotate.status
 <= logrotate
 recipe = slapos.cookbook:logrotate.d
 name = mariadb
-log = $${mariadb:error-log} $${mariadb:slow-query-log}
+log = $${mariadb:error-log}
 frequency = daily
 rotate-num = 30
 post = $${mariadb:logrotate-post}