Fix instance request for LAMP

stack/lamp/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [lamp-instance]
 filename = instance.cfg.in
-md5sum = 7854dd0edd48f2d91c16412c4a875ca4
+md5sum = 0ff78ad2d277860d6a5b377e3fd5dca7
 
 [instance-apache-php]
 filename = instance-apache-php.cfg.in
@@ -22,7 +22,7 @@ md5sum = 1e4762a6a7631d517fb45c84f9c989fe
 
 [instance-lamp]
 filename = instance-lamp.cfg.jinja2.in
-md5sum = 347ddf1516bf2ddb5f6fb23539382847
+md5sum = 35038259c2f8e240f6377832cb2bee39
 
 [template-apache.conf]
 filename = apache.conf.in

stack/lamp/instance-lamp.cfg.jinja2.in

@@ -20,7 +20,7 @@ partition-id = ${slap-connection:partition-id}
 [request-apache]
 <= request-common
 software-type = apache
-name = apache-php
+name = apache-php-{{ root_title }}
 sla-computer_guid = {{ dumps(slapparameter_dict.get('apache-computer-guid', '')) }}
 {% for key, value in slapparameter_dict.items() -%}
 {%  if key.startswith('instance.') -%}
@@ -40,7 +40,7 @@ return =
 [request-mariadb]
 <= request-common
 software-type = mariadb
-name = Mariadb
+name = Mariadb-{{ root_title }}
 sla-computer_guid = {{ dumps(slapparameter_dict.get('mariadb-computer-guid', '')) }}
 config-database-list = {{ dumps([{'name': db_name, 'user': db_user, 'password': db_password }]) }}
 config-test-database-amount = {{ dumps(0) }}

stack/lamp/instance.cfg.in

@@ -34,6 +34,7 @@ context =
   key ipv6 slap-configuration:ipv6
   key slapparameter_dict slap-configuration:configuration
   key computer_id slap-configuration:computer
+  key root_title slap-configuration:root-instance-title
   raw template_monitor {{ template_monitor }}
   raw openssl_location {{ openssl_location }}
   raw logrotate_cfg {{ logrotate_cfg }}