Don't hardcode www path

227c684f · Cédric de Saint Martin · 2275b19b · 227c684f · 227c684f
Commit 227c684f authored Feb 05, 2013 by Cédric de Saint Martin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

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

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

No files found.
--- a/stack/lamp/apache/instance-apache-php.cfg.in
+++ b/stack/lamp/apache/instance-apache-php.cfg.in
@@ -55,6 +55,7 @@ logrotate-backup = $${basedirectory:backup}/logrotate
 report = $${rootdirectory:etc}/report
 stunnel-conf = $${rootdirectory:etc}/stunnel
 xml-report = $${rootdirectory:var}/xml_report
+www = $${rootdirectory:srv}/www/
 [cadirectory]
 recipe = slapos.cookbook:mkdirectory
@@ -194,7 +195,7 @@ source = ${application:location}
 template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
-htdocs = $${rootdirectory:srv}/www/
+htdocs = $${directory:www}
 pid-file = $${basedirectory:run}/apache.pid
 lock-file = $${basedirectory:run}/apache.lock
 ip = $${slap-network-information:global-ipv6}

--- a/stack/lamp/buildout.cfg
+++ b/stack/lamp/buildout.cfg
@@ -71,7 +71,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
 output = ${buildout:directory}/instance-apache-php.cfg
-md5sum = bf3219cd7d318e02e39c462fbb530715
+md5sum = 0538b05d27d8a64e89f898c09eb57716
 mode = 0644
 [instance-apache-backup]