move cors configuration ckan conf

ilarimikkonen · Nov 1, 2017 · 17db2b7 · 17db2b7
1 parent 165a91f
commit 17db2b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/ansible/roles/ckan/templates/apache2.j2 b/ansible/roles/ckan/templates/apache2.j2
@@ -20,10 +20,6 @@ WSGISocketPrefix /var/run/wsgi
     #SSLCertificateFile      {{ certificates_path }}/{{ssl_crt_primary}}
     #SSLCertificateKeyFile   {{ certificates_path }}/{{ssl_key_primary}}
 
-    # allow CORS
-    Header always set Access-Control-Allow-Origin "*"
-    Header always set Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"
-    Header always set Access-Control-Allow-Headers "X-CKAN-API-KEY, Content-Type"
 
     # Respond to all OPTIONS requests with 200 OK
     # This could be done in the webapp

diff --git a/ansible/roles/ckan/templates/ckan.ini.j2 b/ansible/roles/ckan/templates/ckan.ini.j2
@@ -63,7 +63,9 @@ ckan.locales_filtered_out = en_GB
 ckan.feeds.authority_name = 
 ckan.feeds.date = 
 ckan.feeds.author_name = 
-ckan.feeds.author_link = 
+ckan.feeds.author_link =
+
+ckan.cors.origin_allow_all = True
 
 email_to = {{ error_email }}
 error_email_from = {{ error_email_from }}