Update configuration

Author: hel-platta-service

.platform/schema

@@ -1 +1 @@
-16
+17

composer.lock

@@ -17,6 +17,7 @@ weight: 0
 is_admin: false
 permissions:
   - 'access content'
+  - 'access debug api'
   - 'send javascript errors to sentry'
   - 'view helfi_announcements external entity'
   - 'view helfi_news external entity'

conf/cmi/user.role.anonymous.yml

@@ -14,6 +14,3 @@ COPY docker/openshift/deploy /deploy
 RUN chmod +x /entrypoints/* /deploy/* /crons/*
 
 COPY docker/openshift/init.sh /
-
-# Copy nginx overrides.
-COPY docker/openshift/custom.locations /etc/nginx/conf.d/custom.locations

docker/openshift/Dockerfile

@@ -67,6 +67,14 @@ function environment_variable_isset(array $items) : bool {
   'all.preflight.php',
 ];
 
+$private_files_folder = getenv('DRUPAL_FILES_PRIVATE');
+
+// Make sure private files folder is outside webroot unless explicitly
+// configured so.
+if (!$private_files_folder && is_dir('/var/www/html/public/sites/default/files/private')) {
+  preflight_failed('sites/default/files/private folder found.');
+}
+
 // Allow additional custom checks to be added.
 // Create a 'all.preflight.php' file for checks that need to be run
 // on all environments and '{env}.preflight.php' for environment-specific

docker/openshift/custom.locations

@@ -110,7 +110,7 @@ function drupal_get_env(string|array $variables) : mixed {
 
 $settings['config_sync_directory'] = '../conf/cmi';
 $settings['file_public_path'] = getenv('DRUPAL_FILES_PUBLIC') ?: 'sites/default/files';
-$settings['file_private_path'] = getenv('DRUPAL_FILES_PRIVATE');
+$settings['file_private_path'] = getenv('DRUPAL_FILES_PRIVATE') ?: '/private_files';
 $settings['file_temp_path'] = getenv('DRUPAL_TMP_PATH') ?: '/tmp';
 
 if ($reverse_proxy_address = getenv('DRUPAL_REVERSE_PROXY_ADDRESS')) {