diff options
| author | Struan Donald <struan@exo.org.uk> | 2017-07-27 14:40:29 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2017-07-27 14:42:39 +0100 |
| commit | 6b764a6963bed1b0366195e86d0f7ca7bcba5b36 (patch) | |
| tree | d598799eb50e7f5b57d5b340896f5cbfebb4e379 | |
| parent | f9dfc8e1a53b240b4c67ecf40646b395c172f365 (diff) | |
update mapit url to https in example webserver configs
Now that MapIt is https only the proxy pass URLs need to be https
otherwise we proxy back the 301 redirect and various bits of the
JavaScript fail the pre-flight CORS check.
| -rw-r--r-- | conf/httpd.conf-example | 4 | ||||
| -rw-r--r-- | conf/nginx.conf.example | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/httpd.conf-example b/conf/httpd.conf-example index d86517333..55be895e8 100644 --- a/conf/httpd.conf-example +++ b/conf/httpd.conf-example @@ -22,8 +22,8 @@ RewriteRule ^/alerts/?$ /alert [R=permanent,L] # Proxy mapit so that our js code can make calls on the originating server. Use # a RewriteRule rather than ProxyPass so that Apache's processing order is more # predictable. ProxyPassReverse is not affected by this. -RewriteRule /mapit/(.*) http://mapit.mysociety.org/$1 [P,L] -ProxyPassReverse /mapit/ http://mapit.mysociety.org/ +RewriteRule /mapit/(.*) https://mapit.mysociety.org/$1 [P,L] +ProxyPassReverse /mapit/ https://mapit.mysociety.org/ # serve static files directly RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f diff --git a/conf/nginx.conf.example b/conf/nginx.conf.example index e166fc532..cc246d0db 100644 --- a/conf/nginx.conf.example +++ b/conf/nginx.conf.example @@ -47,7 +47,7 @@ server { rewrite ^/alerts/?$ /alert permanent; location /mapit { - proxy_pass http://mapit.mysociety.org/; + proxy_pass https://mapit.mysociety.org/; proxy_set_header X-Real-IP $remote_addr; } |