Commit 71b0f54e authored by Alain Takoudjou's avatar Alain Takoudjou

stack/lamp: fix default-document-root

parent feaa2a84
{% set document_root = parameter_dict.get('document-root', parameter_dict['default-document-root']) -%}
<VirtualHost *:{{ parameter_dict['port'] }}> <VirtualHost *:{{ parameter_dict['port'] }}>
ServerAdmin admin@example.com 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 SetEnvIf Origin "^http(s)?://(.+\.)?(app\.officejs\.com)$" ORIGIN_DOMAIN=$0
Header always set Access-Control-Allow-Origin "%{ORIGIN_DOMAIN}e" env=ORIGIN_DOMAIN Header always set Access-Control-Allow-Origin "%{ORIGIN_DOMAIN}e" env=ORIGIN_DOMAIN
...@@ -9,12 +10,12 @@ ...@@ -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 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" Header always set Strict-Transport-Security "max-age=15552000; includeSubDomains"
<Directory {{ parameter_dict['document-root'] }}> <Directory {{ document_root }}>
Options +FollowSymlinks Options +FollowSymlinks
AllowOverride All AllowOverride All
Require all granted Require all granted
SetEnv HOME {{ parameter_dict['document-root'] }} SetEnv HOME {{ document_root }}
SetEnv HTTP_HOME {{ parameter_dict['document-root'] }} SetEnv HTTP_HOME {{ document_root }}
Dav off Dav off
</Directory> </Directory>
......
...@@ -18,7 +18,7 @@ md5sum = 0fa7f628756b7ba10b651fe5549def89 ...@@ -18,7 +18,7 @@ md5sum = 0fa7f628756b7ba10b651fe5549def89
[instance-apache-php] [instance-apache-php]
filename = instance-apache-php.cfg.in filename = instance-apache-php.cfg.in
md5sum = 1d4483d1dff6f3b601a5582213f36369 md5sum = 765372ad68b61f117f666f30f0ad153f
[instance-lamp] [instance-lamp]
filename = instance-lamp.cfg.jinja2.in filename = instance-lamp.cfg.jinja2.in
...@@ -34,4 +34,4 @@ md5sum = 980f603c34fcb008ce73a9dde2dbceb3 ...@@ -34,4 +34,4 @@ md5sum = 980f603c34fcb008ce73a9dde2dbceb3
[template-apache-httpd] [template-apache-httpd]
filename = apache-httpd.conf.in filename = apache-httpd.conf.in
md5sum = 88324113df68851fd4b5bca4f7d40db4 md5sum = b2a413238cfc9d73b6916ed4fcee28ec
...@@ -201,7 +201,7 @@ db-password = ${mariadb-urlparse:password} ...@@ -201,7 +201,7 @@ db-password = ${mariadb-urlparse:password}
db-name = ${mariadb-urlparse:path} db-name = ${mariadb-urlparse:path}
db-host = ${mariadb-urlparse:host} db-host = ${mariadb-urlparse:host}
db-port = ${mariadb-urlparse:port} 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} backend-url = ${apache-php-configuration:url}
php-bin = {{ parameter_dict['apache-php-location'] }}/bin/php php-bin = {{ parameter_dict['apache-php-location'] }}/bin/php
php-ini = ${php.ini-conf:output} php-ini = ${php.ini-conf:output}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment