Merge pull request #987 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Dec 3, 2024 · 94e40db · 94e40db
2 parents 7988b8f + cb0f7a4
commit 94e40db
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 50 deletions.
diff --git a/.platform/schema b/.platform/schema
@@ -1 +1 @@
-10
+12
diff --git a/composer.json b/composer.json
@@ -27,6 +27,7 @@
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+        "dg/bypass-finals": "^1.5",
         "drupal/coder": "^8.3",
         "drupal/core-dev": "^10.1",
         "jangregor/phpstan-prophecy": "^1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/language/fi/social_media.settings.yml b/conf/cmi/language/fi/social_media.settings.yml
@@ -1,7 +1,7 @@
 social_media:
   facebook_share:
     text: 'Jaa Facebook-palvelussa'
-    api_url: 'http://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]'
+    api_url: 'https://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]'
     attributes: "target|_blank\r\nclass|facebook-share"
   linkedin:
     text: 'Jaa LinkedIn-palvelussa'

diff --git a/conf/cmi/language/sv/social_media.settings.yml b/conf/cmi/language/sv/social_media.settings.yml
@@ -1,7 +1,7 @@
 social_media:
   facebook_share:
     text: 'Dela på Facebook'
-    api_url: 'http://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]'
+    api_url: 'https://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]'
     attributes: "target|_blank\r\nclass|facebook-share"
   linkedin:
     text: 'Dela på Linkedin'

diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -289,7 +289,7 @@ function drupal_get_env(string|array $variables) : mixed {
     'helfi_api_base_revision',
   ];
   foreach ($queues as $queue) {
-    $settings['queue_service_' . $queue] = 'queue.stomp.default';
+    // $settings['queue_service_' . $queue] = 'queue.stomp.default';
   }
   // You must configure project specific queues manually in 'all.settings.php'
   // file.
@@ -359,6 +359,27 @@ function drupal_get_env(string|array $variables) : mixed {
   'additionalFiles' => [],
 ];
 
+// Elasticsearch server config.
+if (getenv('ELASTICSEARCH_URL')) {
+  $config['search_api.server.default']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL');
+
+  if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) {
+    $config['search_api.server.default']['backend_config']['connector'] = 'helfi_connector';
+    $config['search_api.server.default']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER');
+    $config['search_api.server.default']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD');
+  }
+}
+
+
+// Supported values: https://github.com/Seldaek/monolog/blob/main/doc/01-usage.md#log-levels.
+$default_log_level = getenv('APP_ENV') === 'production' ? 'info' : 'debug';
+$settings['helfi_api_base.log_level'] = getenv('LOG_LEVEL') ?: $default_log_level;
+
+// Turn sentry JS error tracking on if SENTRY_DSN_PUBLIC is defined.
+if (getenv('SENTRY_DSN_PUBLIC')) {
+  $config['raven.settings']['javascript_error_handler'] = TRUE;
+}
+
 // Environment specific overrides.
 if (file_exists(__DIR__ . '/all.settings.php')) {
   // phpcs:ignore
@@ -389,15 +410,6 @@ function drupal_get_env(string|array $variables) : mixed {
   }
 }
 
-// Supported values: https://github.com/Seldaek/monolog/blob/main/doc/01-usage.md#log-levels.
-$default_log_level = getenv('APP_ENV') === 'production' ? 'info' : 'debug';
-$settings['helfi_api_base.log_level'] = getenv('LOG_LEVEL') ?: $default_log_level;
-
-// Turn sentry JS error tracking on if SENTRY_DSN_PUBLIC is defined.
-if (getenv('SENTRY_DSN_PUBLIC')) {
-  $config['raven.settings']['javascript_error_handler'] = TRUE;
-}
-
 /**
  * Deployment identifier.
  *