Cleanup and use of latest resilient improvements in lamp stack.

stack/lamp/apache/instance-apache-export.cfg.jinja2

-# This file is responsible of two things:
+# This file is responsible of three things:
 # 1/ Act as "Apache exporter"
 # 2/ Act as "Mariadb backup infrastructure requester"
+# 3/ Act as "Apache" instance
 
 {% import 'parts' as parts %}
 {% import 'replicated' as replicated %}
@@ -9,7 +10,6 @@
 extends = {{templateapache}}
           {{templatepbsreadyexport}}
 
-
 parts +=
     {{ parts.replicate("mariadb", "3") }}
 
@@ -34,17 +34,24 @@ parts +=
 
 # Nothing to do for the exporter. Just dummy part that does nothing.
 # For httpd instance, PBS will directly pull data from srv/www.
+# XXX-Cedric: write a real backup system.
 [exporter]
 wrapper = /bin/true
 
 # State that we want to backup srv/www directory, not srv/backup.
+# XXX-Cedric: works well, but doesn't work with big data.
 [rdiff-backup-server]
 path = ${directory:www}
 
-# XXX-Cedric: resilient uses "urls" part to publish, but apache doesn't.
-[urls]
-<= publish-connection-informations
+# Add "exporter" parameters to list of published connection parameters
+[publish-connection-informations]
+# XXX-Cedric: Long term goal: could be a recipe that requests an instance and
+# bubbles ALL
+# parameters of the requested instance. Requirement: aggregated publish.
+<= resilient-publish-connection-parameter
 
 # XXX-Cedric: resilient overwrites what's returned from request-mariadb
+# XXX-Cedric: change the request method to return everything from
+#             getConnectionParameterDict()
 [request-mariadb]
 return = ssh-public-key ssh-url notification-id ip url

stack/lamp/apache/instance-apache-import.cfg.in

@@ -3,30 +3,18 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-# XXX-Cedric: is instance-apache-php needed?
-#extends = ${instance-apache-php:output}
-#          ${pbsready-import:output}
 extends = ${pbsready-import:output}
 
-parts +=
-# have to repeat the next one, as it's not inherited from pbsready-import
-    import-on-notification
-
 [directory]
 srv = $${buildout:directory}/srv
 www = $${:srv}/www/
 
 # Nothing to do for the import. Just dummy part that does nothing.
 # For httpd instance, PBS will directly push data to srv/www.
-# XXX-Cedric: is it safe?
+# XXX-Cedric: write a real backup system.
 [importer]
 wrapper = /bin/true
 
-# XXX-Cedric: resilient uses "urls" part to publish, but apache doesn't.
-[urls]
-recipe = slapos.cookbook:publish
-
-
 # State that we want to push to srv/www directory, not srv/backup.
 [rdiff-backup-server]
 path = $${directory:www}

stack/lamp/buildout.cfg

@@ -81,7 +81,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/apache/instance-apache-import.cfg.in
 output = ${buildout:directory}/instance-apache-import.cfg
-md5sum = 4067a0d32efbfad3923f3fe5a8ce77b4
+md5sum = f1dc2a71d362b5d2d36481ffefdd2293
 mode = 0644
 
 [instance-apache-export]
@@ -95,7 +95,7 @@ context = key templateapache instance-apache-php:output
 import-list = file parts template-parts:destination
               file replicated template-replicated:destination
 
-md5sum = 6647004fd5a2a3d74e3d7f8aa6b4b226
+md5sum = 2dc6134621b8a12817d43a979b84089a
 mode = 0644
 
 [instance-resilient]
@@ -131,7 +131,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/mariadb/instance-mariadb-export.cfg.in
 output = ${buildout:directory}/instance-mariadb-export.cfg
-md5sum = 13703a15d9d73f59598505dac8ed4967
+md5sum = 0352896921ca1766b64f0b54f0f8c27e
 mode = 0644
 
 

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

@@ -18,6 +18,7 @@ parts +=
   slapmonitor
   slapmonitor-xml
 
+# Define exporter strategy
 [exporter]
 recipe = slapos.cookbook:mydumper
 wrapper = $${rootdirectory:bin}/$${slap-parameter:namebase}-exporter
@@ -27,3 +28,7 @@ user = root
 mydumper-binary = ${mydumper:location}/bin/mydumper
 database = $${mariadb:database}
 import = false
+
+# Extends publish section with resilient parameters
+[urls]
+<= resilient-publish-connection-parameter
\ No newline at end of file