stack/lamp: fix default-document-root

stack/lamp/apache-httpd.conf.in

+{% set document_root = parameter_dict.get('document-root', parameter_dict['default-document-root']) -%}
 <VirtualHost *:{{ parameter_dict['port'] }}>
   ServerAdmin admin@example.com
-  DocumentRoot {{ parameter_dict.get('document-root', parameter_dict['default-document-root']) }}
+  DocumentRoot {{ document_root }}
 
   SetEnvIf Origin "^http(s)?://(.+\.)?(app\.officejs\.com)$" ORIGIN_DOMAIN=$0
   Header always set Access-Control-Allow-Origin "%{ORIGIN_DOMAIN}e" env=ORIGIN_DOMAIN
@@ -9,12 +10,12 @@
   Header always set Access-Control-Allow-Headers "Overwrite, Destination, Content-Type, Depth, User-Agent, X-File-Size, X-Requested-With, If-Modified-Since, X-File-Name, Cache-Control, Authorization" env=ORIGIN_DOMAIN
   Header always set Strict-Transport-Security "max-age=15552000; includeSubDomains"
 
-  <Directory {{ parameter_dict['document-root'] }}>
+  <Directory {{ document_root }}>
       Options +FollowSymlinks
       AllowOverride All
       Require all granted
-      SetEnv HOME {{ parameter_dict['document-root'] }}
-      SetEnv HTTP_HOME {{ parameter_dict['document-root'] }}
+      SetEnv HOME {{ document_root }}
+      SetEnv HTTP_HOME {{ document_root }}
       Dav off
 
   </Directory>

stack/lamp/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 0fa7f628756b7ba10b651fe5549def89
 
 [instance-apache-php]
 filename = instance-apache-php.cfg.in
-md5sum = 4054275083687d619ec55bc7c72d9d6b
+md5sum = 4e0a5af8b8d92a77a3ced7d55fb14257
 
 [instance-lamp]
 filename = instance-lamp.cfg.jinja2.in
@@ -34,4 +34,4 @@ md5sum = bf21c6d68ef85ee7de090375424d0c5c
 
 [template-apache-httpd]
 filename = apache-httpd.conf.in
-md5sum = 88324113df68851fd4b5bca4f7d40db4
+md5sum = b2a413238cfc9d73b6916ed4fcee28ec

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

@@ -201,7 +201,7 @@ db-password = ${mariadb-urlparse:password}
 db-name = ${mariadb-urlparse:path}
 db-host = ${mariadb-urlparse:host}
 db-port = ${mariadb-urlparse:port}
-document-root = ${apache-php-configuration:document-root}
+document-root = ${apache-php-configuration:default-document-root}
 backend-url = ${apache-php-configuration:url}
 php-bin = {{ parameter_dict['apache-php-location'] }}/bin/php
 php-ini = ${php.ini-conf:output}