WIP: Update lamp stack

stack/lamp/buildout.cfg

@@ -98,14 +98,14 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-backup.cfg
 output = ${buildout:directory}/template-apache-backup.cfg
-md5sum = bb304cefde1f981f91b8ad08eb14d3a8
+md5sum = 1f4822930c99c56970913763f406a020
 mode = 0644
 
 [template-backuped]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-backuped.cfg
 output = ${buildout:directory}/template-backuped.cfg
-md5sum = b7b9b8093accbd7fbc524b4907370128
+md5sum = b989e07c047fe9903719257a9d192c23
 mode = 0644
 
 [template-mariadb]
@@ -119,28 +119,28 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb-pbsready.cfg
 output = ${buildout:directory}/template-mariadb-pbsready.cfg
-md5sum = a55976b334cf2042b9182634a20fa25a
+md5sum = 6f0668043fc3fa79e0a5a263b68589e8
 mode = 0644
 
 [template-mariadb-pbsready-import]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb-pbsready-import.cfg
 output = ${buildout:directory}/template-mariadb-pbsready-import.cfg
-md5sum = 693745df17f339eadf8ada55ae0b88fb
+md5sum = 6042272fecdeee6ddd05c265b64b1152
 mode = 0644
 
 [template-mariadb-pbsready-export]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb-pbsready-export.cfg
 output = ${buildout:directory}/template-mariadb-pbsready-export.cfg
-md5sum = a3426f38c1e327a8d7d76d151e5d978d
+md5sum = b4b1f57775bc56bd108c4c3b652e752c
 mode = 0644
 
 [template-pull-backup]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-pull-backup.cfg
 output = ${buildout:directory}/template-pull-backup.cfg
-md5sum = a1b4902d7d24324ffd4968ddfc1213c4
+md5sum = 5a188d0334ab0b4ac4e64f1390984892
 mode = 0644
 
 [eggs]

stack/lamp/instance-apache-backup.cfg

@@ -180,6 +180,7 @@ gunicorn = ${buildout:bin-directory}/gunicorn
 partition-id = $${slap-connection:partition-id}
 computer-id = $${slap-connection:computer-id}
 config-file = $${rootdirectory:etc}/agent.py
+type = apache-backup
 peers =
     $${slap-parameter:request-agent-url}
     $${request-pull-backup-server-apache-backup:connection-agent-url}
@@ -198,8 +199,10 @@ recipe = slapos.cookbook:watchdog
 agent-url = $${agent-data:url}
 wrapper = $${basedirectory:services}/watchdog
 binary = ${buildout:bin-directory}/wp-watchdog
-partition-id = $${slap-connection:partition-id}
-computer-id = $${slap-connection:computer-id}
+master-url = $${slap-connection:server-url}
+cert-file = $${slap-connection:cert-file}
+key-file = $${slap-connection:key-file}
+software-release-url = $${slap-connection:software-release-url}
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory

stack/lamp/instance-backuped.cfg

@@ -23,6 +23,7 @@ parts =
   sshkeys-authority
   dropbear-server-pbs-authorized-key
   logrotate-entry-equeue
+  logfollower
   agent
   agent-wrapper
   watchdog
@@ -76,6 +77,17 @@ path = $${directory:htdocs}
 wrapper = $${rootdirectory:bin}/rdiffbackup-server
 rdiffbackup-binary = ${buildout:bin-directory}/rdiff-backup
 
+[logfollower]
+recipe = slapos.cookbook:logfollower
+binary = ${buildout:bin-directory}/wp-logfollower
+wait-for-creation = true
+rotated = true
+regex = .+PHP Warning: +mysql_.+
+url = $${agent-data:url}log/mariadb
+wrapper = $${basedirectory:services}/logfollower
+timeout = 120
+file = $${apache-php:php-error-log}
+
 [agent-data]
 host = $${slap-network-information:global-ipv6}
 port = 8081
@@ -93,6 +105,7 @@ gunicorn = ${buildout:bin-directory}/gunicorn
 partition-id = $${slap-connection:partition-id}
 computer-id = $${slap-connection:computer-id}
 config-file = $${rootdirectory:etc}/agent.py
+type = apache-php
 peers =
     $${request-pull-backup-server:connection-agent-url}
     $${request-mariadb:connection-agent-url}
@@ -113,8 +126,10 @@ recipe = slapos.cookbook:watchdog
 agent-url = $${agent-data:url}
 wrapper = $${basedirectory:services}/watchdog
 binary = ${buildout:bin-directory}/wp-watchdog
-partition-id = $${slap-connection:partition-id}
-computer-id = $${slap-connection:computer-id}
+master-url = $${slap-connection:server-url}
+cert-file = $${slap-connection:cert-file}
+key-file = $${slap-connection:key-file}
+software-release-url = $${slap-connection:software-release-url}
 
 [logrotate-entry-equeue]
 <= logrotate

stack/lamp/instance-mariadb-pbsready-export.cfg

@@ -42,3 +42,6 @@ name = Pull Backup Server pulling from main MariaDB
 config-type = pull
 config += trigger-feed
 config-trigger-feed = $${notifier-mydumper-data:write-url}
+
+[agent]
+type = mariadb

stack/lamp/instance-mariadb-pbsready-import.cfg

@@ -26,3 +26,6 @@ name = Pull Backup Server pushing on backup MariaDB
 config-type = push
 config += notify
 config-notify = $${urls:notify-url}
+
+[agent]
+type = mariadb-backup

stack/lamp/instance-mariadb-pbsready.cfg

@@ -122,8 +122,10 @@ recipe = slapos.cookbook:watchdog
 agent-url = $${agent-data:url}
 wrapper = $${basedirectory:services}/watchdog
 binary = ${buildout:bin-directory}/wp-watchdog
-partition-id = $${slap-connection:partition-id}
-computer-id = $${slap-connection:computer-id}
+master-url = $${slap-connection:server-url}
+cert-file = $${slap-connection:cert-file}
+key-file = $${slap-connection:key-file}
+software-release-url = $${slap-connection:software-release-url}
 
 [request-pull-backup-server]
 <= slap-connection

stack/lamp/instance-pull-backup.cfg

@@ -46,6 +46,7 @@ gunicorn = ${buildout:bin-directory}/gunicorn
 partition-id = $${slap-connection:partition-id}
 computer-id = $${slap-connection:computer-id}
 config-file = $${rootdirectory:etc}/agent.py
+type = pull-backup
 peers =
     $${pbs:peers}
     $${slap-parameter:request-agent-url}
@@ -64,8 +65,10 @@ recipe = slapos.cookbook:watchdog
 agent-url = $${agent-data:url}
 wrapper = $${basedirectory:services}/watchdog
 binary = ${buildout:bin-directory}/wp-watchdog
-partition-id = $${slap-connection:partition-id}
-computer-id = $${slap-connection:computer-id}
+master-url = $${slap-connection:server-url}
+cert-file = $${slap-connection:cert-file}
+key-file = $${slap-connection:key-file}
+software-release-url = $${slap-connection:software-release-url}
 
 [dropbear-client]
 recipe = slapos.cookbook:dropbear.client