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

Access Control for Starter Site #349

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open

Access Control for Starter Site #349

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f92ccb
Add steps to create private file directory
kylehuynh205 Jul 6, 2023
38e437a
Removed because it's not nescessary
kylehuynh205 Jul 13, 2023
25121da
Update Makefile
kylehuynh205 Jul 13, 2023
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
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ local: generate-secrets
curl -k -u admin:'$(shell cat secrets/live/DRUPAL_DEFAULT_ACCOUNT_PASSWORD)' -H "Content-Type: application/json" -d "@build/demo-data/homepage.json" https://${DOMAIN}/node?_format=json
curl -k -u admin:'$(shell cat secrets/live/DRUPAL_DEFAULT_ACCOUNT_PASSWORD)' -H "Content-Type: application/json" -d "@build/demo-data/browse-collections.json" https://${DOMAIN}/node?_format=json
$(MAKE) login

# make private file directory
docker-compose exec -T drupal mkdir -p $(CURDIR)/codebase/web/sites/default/private_files
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Best practice is to create a directory outside of the web root. Otherwise (unless you take careful explicit steps to protect it) all the files will be directly accessible over the internet.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved it out to outside web directory kylehuynh205/islandora-starter-site@7672e77

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool. Where is the command that creates the private_files directory?


.PHONY: starter
## Make a local site with codebase directory bind mounted, using starter site unless other package specified in .env or present already.
Expand All @@ -183,7 +184,7 @@ starter_dev: QUOTED_CURDIR = "$(CURDIR)"
starter_dev: generate-secrets
$(MAKE) starter-init ENVIRONMENT=starter_dev
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 -b main https://github.com/Islandora-Devops/islandora-starter-site /home/root;'; \
docker container run --rm -v $(CURDIR)/codebase:/home/root $(REPOSITORY)/nginx:$(TAG) with-contenv bash -lc 'git clone -b islandora_group https://github.com/kylehuynh205/islandora-starter-site.git /home/root;'; \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I get that this is how to get it running, but we are not helped by committing feature branches into our toolchain!

fi
$(MAKE) set-files-owner SRC=$(CURDIR)/codebase ENVIRONMENT=starter_dev
docker compose up -d --remove-orphans
Expand All @@ -200,6 +201,7 @@ production: generate-secrets
docker compose exec -T drupal with-contenv bash -lc 'composer install; chown -R nginx:nginx .'
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 fedoraadmin admin"
docker-compose exec -T drupal with-contenv bash -lc "drush -l $(SITE) user:role:add administrator admin"
rosiel marked this conversation as resolved.
Show resolved Hide resolved
MIGRATE_IMPORT_USER_OPTION=--userid=1 $(MAKE) hydrate
docker compose exec -T drupal with-contenv bash -lc 'drush -l $(SITE) migrate:import --userid=1 islandora_fits_tags'
$(MAKE) login
Expand Down
4 changes: 2 additions & 2 deletions sample.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,6 @@ TRAEFIK_MEMORY_LIMIT=8G
WATCHTOWER_MEMORY_LIMIT=2G

# Configuration to enable the custom delegate script for Cantaloupe
CANTALOUPE_DELEGATE_SCRIPT_ENABLED=false
CANTALOUPE_DELEGATE_SCRIPT_ENABLED=true
CANTALOUPE_DELEGATE_SCRIPT_PATHNAME=/opt/tomcat/bin/delegates.rb
CANTALOUPE_HTTPSOURCE_LOOKUP_STRATEGY=BasicLookupStrategy
CANTALOUPE_HTTPSOURCE_LOOKUP_STRATEGY=ScriptLookupStrategy