Merge remote-tracking branch 'origin/wordpress'

8ee54da7 · Cédric de Saint Martin · 6e3ff57b · b3cce13c · 8ee54da7 · 8ee54da7
Commit 8ee54da7 authored Sep 18, 2012 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

stack/lamp/buildout.cfg stack/lamp/buildout.cfg +1 -1

stack/lamp/instance-apache-php.cfg stack/lamp/instance-apache-php.cfg +1 -1

No files found.
--- a/stack/lamp/buildout.cfg
+++ b/stack/lamp/buildout.cfg
@@ -66,7 +66,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-php.cfg
 output = ${buildout:directory}/template-apache-php.cfg
-md5sum = 59cee571ea0fcdf2e6c9b3195e258738
+md5sum = a5dd222b3faa4e1ef2df9b3b9bb47966
 mode = 0644

 [template-apache-backup]

--- a/stack/lamp/instance-apache-php.cfg
+++ b/stack/lamp/instance-apache-php.cfg
@@ -107,7 +107,7 @@ software-url = $${slap-connection:software-release-url}
 software-type = mariadb
 return = url
 sla = computer_guid
-sla-computer_guid = ${slap-connection:computer-id}
+sla-computer_guid = $${slap-connection:computer-id}

 [mariadb-urlparse]
 recipe = slapos.cookbook:urlparse