Commit 47c2fa64 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

slaprunner: Now support CORS (works with dav)

parent 3c1e68fb
...@@ -103,7 +103,7 @@ mode = 0644 ...@@ -103,7 +103,7 @@ mode = 0644
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/httpd_conf.in url = ${:_profile_base_location_}/httpd_conf.in
download-only = true download-only = true
md5sum = 444399390eb19c7e23dd06593c067b4d md5sum = ffbf52ee43e64f58e7a3f64745fd9aab
filename = httpd_conf.in filename = httpd_conf.in
mode = 0644 mode = 0644
......
...@@ -27,6 +27,7 @@ LoadModule dav_module modules/mod_dav.so ...@@ -27,6 +27,7 @@ LoadModule dav_module modules/mod_dav.so
LoadModule dav_fs_module modules/mod_dav_fs.so LoadModule dav_fs_module modules/mod_dav_fs.so
LoadModule cache_module modules/mod_cache.so LoadModule cache_module modules/mod_cache.so
LoadModule file_cache_module modules/mod_file_cache.so LoadModule file_cache_module modules/mod_file_cache.so
LoadModule setenvif_module modules/mod_setenvif.so
ErrorLog "{{ parameters.path_error_log }}" ErrorLog "{{ parameters.path_error_log }}"
LogFormat "%h %l %u %t \"%r\" %>s %b" common LogFormat "%h %l %u %t \"%r\" %>s %b" common
...@@ -45,6 +46,12 @@ SSLHonorCipherOrder On ...@@ -45,6 +46,12 @@ SSLHonorCipherOrder On
SSLCipherSuite RC4-SHA:HIGH:!ADH SSLCipherSuite RC4-SHA:HIGH:!ADH
SSLEngine On SSLEngine On
SetEnvIf Origin "http(s)?://(www\.)?(.*)$" AccessControlAllowOrigin=$0$1
Header always set Access-Control-Allow-Origin %{AccessControlAllowOrigin}e env=AccessControlAllowOrigin
Header set Access-Control-Allow-Credentials "true"
Header set Access-Control-Allow-Methods "PROPFIND, PROPPATCH, COPY, MOVE, DELETE, MKCOL, LOCK, UNLOCK, PUT, GETLIB, VERSION-CONTROL, CHECKIN, CHECKOUT, UNCHECKOUT, REPORT, UPDATE, CANCELUPLOAD, HEAD, OPTIONS, GET, POST"
Header 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"
Alias /public {{ parameters.runner_home }}/public Alias /public {{ parameters.runner_home }}/public
<Directory {{ parameters.runner_home }}/public> <Directory {{ parameters.runner_home }}/public>
Order Allow,Deny Order Allow,Deny
...@@ -69,7 +76,9 @@ Alias /share {{ parameters.runner_home }} ...@@ -69,7 +76,9 @@ Alias /share {{ parameters.runner_home }}
AuthType Basic AuthType Basic
AuthName "webdav" AuthName "webdav"
AuthUserFile "{{ parameters.etc_dir }}/.htpasswd" AuthUserFile "{{ parameters.etc_dir }}/.htpasswd"
Require valid-user <LimitExcept OPTIONS>
Require valid-user
</LimitExcept>
</Directory> </Directory>
ScriptSock {{ parameters.path_pid }} ScriptSock {{ parameters.path_pid }}
......
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