Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

- [PR-401](https://github.com/itk-dev/os2loop/pull/401)
Added private files setup
- [PR-400](https://github.com/itk-dev/os2loop/pull/400)
Updated OpenID Connect "prompt" config

Expand Down
1 change: 1 addition & 0 deletions docker-compose.server.prod.subsite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ services:
phpfpm:
volumes:
- ../../shared/${SUB_SITE_FOLDER}:/app/web/sites/${SUB_SITE_FOLDER}
- ../../shared/private-files:/app/private-files

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Should this be

Suggested change
- ../../shared/private-files:/app/private-files
- ../../shared/${SUB_SITE_FOLDER}/private-files:/app/private-files

?

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I don't know enough about how Drupal manages private files to answer authoritatively, but I would think (hope) Drupal can handle both.

But server side it would probably be an advantage to have the files clearly scoped by sub site in the filesystem. For cleanup, backup and monitoring disk usage.

- ../../shared/sites.php:/app/web/sites/sites.php

nginx:
Expand Down
1 change: 1 addition & 0 deletions docker-compose.server.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ services:
volumes:
- ../../shared/settings.local.php:/app/web/sites/default/settings.local.php
- ../../shared/files:/app/web/sites/default/files
- ../../shared/private-files:/app/private-files

nginx:
volumes:
Expand Down
2 changes: 2 additions & 0 deletions web/sites/default/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,8 @@

$settings['skip_permissions_hardening'] = TRUE;

$settings['file_private_path'] = DRUPAL_ROOT . '/../private-files';

/**
* Load local development override configuration, if available.
*
Expand Down
Loading