mirror of
https://github.com/DSpace/DSpace.git
synced 2025-10-07 10:04:21 +00:00
Update dspace-shibboleth docker settings to no longer overwrite Access-Control-Expose-Headers. Instead we'll use the ones from Tomcat.
This commit is contained in:
@@ -34,7 +34,7 @@ RUN apt-get update \
|
|||||||
|
|
||||||
# Setup Apache configs & enable mod-shib & dspace vhost
|
# Setup Apache configs & enable mod-shib & dspace vhost
|
||||||
COPY dspace-vhost.conf /etc/apache2/sites-available/
|
COPY dspace-vhost.conf /etc/apache2/sites-available/
|
||||||
RUN a2enmod ssl headers proxy proxy_ajp proxy_http shib && \
|
RUN a2enmod ssl proxy proxy_ajp proxy_http shib && \
|
||||||
a2dissite 000-default.conf default-ssl.conf && \
|
a2dissite 000-default.conf default-ssl.conf && \
|
||||||
a2ensite dspace-vhost.conf
|
a2ensite dspace-vhost.conf
|
||||||
|
|
||||||
|
@@ -13,10 +13,6 @@
|
|||||||
ErrorLog ${APACHE_LOG_DIR}/dspace.error.log
|
ErrorLog ${APACHE_LOG_DIR}/dspace.error.log
|
||||||
CustomLog ${APACHE_LOG_DIR}/dspace.access.log combined
|
CustomLog ${APACHE_LOG_DIR}/dspace.access.log combined
|
||||||
|
|
||||||
# Required when running DSpace REST API and Angular UI from separate hostnames
|
|
||||||
# This ensures all headers can be passed between frontend and backend
|
|
||||||
Header set Access-Control-Expose-Headers: "Authorization, expires, Location, Content-Disposition, WWW-Authenticate, Set-Cookie, X-Requested-With"
|
|
||||||
|
|
||||||
# SSL Engine Switch:
|
# SSL Engine Switch:
|
||||||
# Enable/Disable SSL for this virtual host.
|
# Enable/Disable SSL for this virtual host.
|
||||||
SSLEngine on
|
SSLEngine on
|
||||||
|
Reference in New Issue
Block a user