From 4a782591756d4f0ea807a7a9b6e9d7a051bdd0fd Mon Sep 17 00:00:00 2001 From: Kyle Huynh Date: Tue, 27 Jun 2023 10:21:48 -0400 Subject: [PATCH 1/3] Test access-control --- custom.Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/custom.Makefile b/custom.Makefile index bab3e6e57..e67ee5c29 100644 --- a/custom.Makefile +++ b/custom.Makefile @@ -26,7 +26,7 @@ lite_dev: QUOTED_CURDIR = "$(CURDIR)" lite_dev: generate-secrets $(MAKE) lite-init ENVIRONMENT=local if [ -z "$$(ls -A $(QUOTED_CURDIR)/codebase)" ]; then \ - docker container run --rm -v $(CURDIR)/codebase:/home/root $(REPOSITORY)/nginx:$(TAG) with-contenv bash -lc 'git clone https://github.com/digitalutsc/islandora-sandbox.git --branch 1.0.0-beta1 /home/root;'; \ + docker container run --rm -v $(CURDIR)/codebase:/home/root $(REPOSITORY)/nginx:$(TAG) with-contenv bash -lc 'git clone -b access_control https://github.com/digitalutsc/islandora-sandbox.git /home/root;'; \ fi $(MAKE) set-files-owner SRC=$(CURDIR)/codebase ENVIRONMENT=local docker-compose up -d --remove-orphans @@ -42,6 +42,9 @@ lite_dev: generate-secrets -docker-compose exec -T drupal drush -y config:set media_thumbnails_video.settings ffprobe /usr/bin/ffprobe docker-compose restart drupal + # create private file directory + docker-compose exec -T drupal mkdir -p $(CURDIR)/codebase/web/sites/default/private_files + # install the site docker-compose exec -T drupal with-contenv bash -lc 'composer install' $(MAKE) lite-finalize ENVIRONMENT=local @@ -51,6 +54,7 @@ lite-finalize: docker-compose exec -T drupal with-contenv bash -lc 'chown -R nginx:nginx .' $(MAKE) drupal-database update-settings-php docker-compose exec -T drupal with-contenv bash -lc "drush si -y --existing-config minimal --account-pass '$(shell cat secrets/live/DRUPAL_DEFAULT_ACCOUNT_PASSWORD)'" + docker-compose exec -T drupal with-contenv bash -lc "drush -l $(SITE) user:role:add administrator admin" MIGRATE_IMPORT_USER_OPTION=--userid=1 $(MAKE) lite_hydrate $(MAKE) login From e17b3ae8b13c2f0d137538df0f490306b1c59230 Mon Sep 17 00:00:00 2001 From: Kyle Huynh <7862086+kylehuynh205@users.noreply.github.com> Date: Tue, 27 Jun 2023 23:43:52 -0400 Subject: [PATCH 2/3] Update sample.env --- sample.env | 1 + 1 file changed, 1 insertion(+) diff --git a/sample.env b/sample.env index 462ebb643..fd95d1319 100644 --- a/sample.env +++ b/sample.env @@ -182,3 +182,4 @@ WATCHTOWER_MEMORY_LIMIT=2G CANTALOUPE_DELEGATE_SCRIPT_ENABLED=true CANTALOUPE_DELEGATE_SCRIPT_PATHNAME=/opt/tomcat/bin/delegates.rb CANTALOUPE_HTTPSOURCE_LOOKUP_STRATEGY=BasicLookupStrategy +CANTALOUPE_HTTPS_URCE_LOOKUP_STRATEGY=ScriptLookupStrategy From f64d8f6ce2c9d00122cc75e47a8f71e94faef381 Mon Sep 17 00:00:00 2001 From: Kyle Huynh Date: Wed, 28 Jun 2023 08:23:12 -0400 Subject: [PATCH 3/3] update sample.env --- sample.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample.env b/sample.env index fd95d1319..13713b28c 100644 --- a/sample.env +++ b/sample.env @@ -181,5 +181,5 @@ WATCHTOWER_MEMORY_LIMIT=2G # Configuration to enable the custom delegate script for Cantaloupe CANTALOUPE_DELEGATE_SCRIPT_ENABLED=true CANTALOUPE_DELEGATE_SCRIPT_PATHNAME=/opt/tomcat/bin/delegates.rb -CANTALOUPE_HTTPSOURCE_LOOKUP_STRATEGY=BasicLookupStrategy +CANTALOUPE_HTTPSOURCE_LOOKUP_STRATEGY=ScriptLookupStrategy CANTALOUPE_HTTPS_URCE_LOOKUP_STRATEGY=ScriptLookupStrategy