Update apache rules for CORS

OpenHistoricalMap · Sep 11, 2023 · 2920cdd · 2920cdd
1 parent 1d23f75
commit 2920cdd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/images/web/Dockerfile b/images/web/Dockerfile
@@ -88,6 +88,8 @@ RUN apt-get update && apt-get install -y libapache2-mod-passenger lighttpd
 # Enable the Passenger Apache module and restart Apache
 RUN echo "ServerName $(cat /etc/hostname)" >> /etc/apache2/apache2.conf
 RUN a2enmod passenger
+RUN a2enmod headers
+RUN a2enmod setenvif
 
 # Check installation
 RUN /usr/bin/passenger-config validate-install

diff --git a/images/web/config/production.conf b/images/web/config/production.conf
@@ -30,6 +30,13 @@
     RewriteCond %{REQUEST_METHOD} ^(GET|HEAD)$
     RewriteRule ^0\.6/(node|way|relation)/([^/]+)$ - [L,H=fcgi:127.0.0.1:80]
 
+    # Conditionally set CORS headers for openhistoricalmap.org subdomains
+    SetEnvIf Origin "https://(.*\.)?openhistoricalmap\.org$" AccessControlAllowOrigin=$0
+    Header set Access-Control-Allow-Origin %{AccessControlAllowOrigin}e env=AccessControlAllowOrigin
+    Header set Access-Control-Allow-Methods "GET, POST, OPTIONS" env=AccessControlAllowOrigin
+    Header set Access-Control-Allow-Headers "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range" env=AccessControlAllowOrigin
+    Header set Access-Control-Expose-Headers "Content-Length,Content-Range" env=AccessControlAllowOrigin
+
     # Relax Apache security settings
     <Directory /var/www/public>
       AllowOverride None

diff --git a/values.staging.template.yaml b/values.staging.template.yaml
@@ -702,7 +702,7 @@ osm-seed:
     # Variables for changeset-replication-job, Configuration to create the replication files by, minute, hour, or day
     # ====================================================================================================
     osmchaWeb:
-      enabled: true
+      enabled: false
       env:
         DJANGO_CACHES: "{'default': {'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', 'LOCATION': '127.0.0.1:11211'}}"
         DJANGO_DEBUG: "False"
@@ -742,7 +742,7 @@ osm-seed:
     # Variables for changeset-replication-job, Configuration to create the replication files by, minute, hour, or day
     # ====================================================================================================
     osmchaDb:
-      enabled: true
+      enabled: false
       env:
         POSTGRES_DB: {{STAGING_OSMCHA_PG_DATABASE}}
         POSTGRES_USER: {{STAGING_OSMCHA_PG_USER}}