Merge pull request #341 from City-of-Helsinki/UHF-6969

UHF-6969: Removed lightweight cron key
City-of-Helsinki · Mar 29, 2023 · 4867697 · 4867697
2 parents e93bb66 + 1517944
commit 4867697
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/conf/cmi/scheduler.settings.yml b/conf/cmi/scheduler.settings.yml
@@ -18,7 +18,7 @@ default_unpublish_enable: false
 default_unpublish_required: false
 default_unpublish_revision: false
 hide_seconds: false
-lightweight_cron_access_key: b0fdc9e415e5590150ed
+lightweight_cron_access_key: ''
 log: true
 time_letters: hHgGisaA
 time_only_format: 'H:i:s'
diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -36,9 +36,12 @@
 // @see https://wodby.com/docs/stacks/drupal/#overriding-settings-from-wodbysettingsphp
 if (isset($_SERVER['WODBY_APP_NAME'])) {
   // The include won't be added automatically if it's already there.
-  include '/var/www/conf/wodby.settings.php';
+  // phpcs:ignore
+  include_once '/var/www/conf/wodby.settings.php'; // NOSONAR
 }
 
+$config['scheduler.settings']['lightweight_cron_access_key'] = getenv('DRUPAL_SCHEDULER_CRON_KEY') ?: $settings['hash_salt'];
+
 $config['openid_connect.client.tunnistamo']['settings']['client_id'] = getenv('TUNNISTAMO_CLIENT_ID');
 $config['openid_connect.client.tunnistamo']['settings']['client_secret'] = getenv('TUNNISTAMO_CLIENT_SECRET');
 
@@ -221,12 +224,14 @@
 
 // Environment specific overrides.
 if (file_exists(__DIR__ . '/all.settings.php')) {
-  include __DIR__ . '/all.settings.php';
+  // phpcs:ignore
+  include_once __DIR__ . '/all.settings.php'; // NOSONAR
 }
 
 if ($env = getenv('APP_ENV')) {
   if (file_exists(__DIR__ . '/' . $env . '.settings.php')) {
-    include __DIR__ . '/' . $env . '.settings.php';
+    // phpcs:ignore
+    include_once __DIR__ . '/' . $env . '.settings.php'; // NOSONAR
   }
 
   $servicesFiles = [
@@ -242,6 +247,7 @@
   }
 
   if (getenv('OPENSHIFT_BUILD_NAMESPACE') && file_exists(__DIR__ . '/azure.settings.php')) {
-    include __DIR__ . '/azure.settings.php';
+    // phpcs:ignore
+    include_once __DIR__ . '/azure.settings.php'; // NOSONAR
   }
 }