Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing http/s error with fcrepo allowed external content #164

Merged
merged 2 commits into from
Jun 30, 2021
Merged

Fixing http/s error with fcrepo allowed external content #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
103ca92
Fixing http/s error with fcrepo allowed external content
dannylamb Jun 28, 2021
0dc1d0a
Need to declare two separate variables
dannylamb Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ download-default-certs:
.SILENT: demo
demo:
$(MAKE) download-default-certs ENVIROMENT=demo
$(MAKE) docker-compose.yml ENVIROMENT=demo
$(MAKE) -B docker-compose.yml ENVIROMENT=demo
$(MAKE) pull ENVIROMENT=demo
mkdir -p $(CURDIR)/codebase
docker-compose up -d
Expand All @@ -339,7 +339,7 @@ demo:
.SILENT: local
local:
$(MAKE) download-default-certs ENVIROMENT=local
$(MAKE) docker-compose.yml ENVIRONMENT=local
$(MAKE) -B docker-compose.yml ENVIRONMENT=local
$(MAKE) pull ENVIRONMENT=local
mkdir -p $(CURDIR)/codebase
if [ -z "$$(ls -A $(CURDIR)/codebase)" ]; then \
Expand Down
3 changes: 2 additions & 1 deletion docker-compose.fcrepo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ services:
fcrepo:
image: ${REPOSITORY:-islandora}/fcrepo:${TAG:-latest}
environment:
FCREPO_ALLOW_EXTERNAL_DRUPAL: http://${DOMAIN}/
FCREPO_ALLOW_EXTERNAL_DRUPALHTTP: http://${DOMAIN}/
FCREPO_ALLOW_EXTERNAL_DRUPALHTTPS: https://${DOMAIN}/
FCREPO_TOMCAT_ADMIN_ROLES: manager-gui,fedoraAdmin
FCREPO_TOMCAT_ADMIN_USER: admin
FCREPO_DISABLE_SYN: ${DISABLE_SYN}
Expand Down
3 changes: 2 additions & 1 deletion docker-compose.fcrepo6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ services:
fcrepo:
image: ${REPOSITORY:-islandora}/fcrepo6:${TAG:-latest}
environment:
FCREPO_ALLOW_EXTERNAL_DRUPAL: http://${DOMAIN}/
FCREPO_ALLOW_EXTERNAL_DRUPALHTTP: http://${DOMAIN}/
FCREPO_ALLOW_EXTERNAL_DRUPALHTTPS: https://${DOMAIN}/
FCREPO_TOMCAT_ADMIN_ROLES: manager-gui,fedoraAdmin
FCREPO_TOMCAT_ADMIN_USER: admin
FCREPO_DISABLE_SYN: ${DISABLE_SYN}
Expand Down