From a0cbe5655c4f081170a2766831c3974b8060a4f1 Mon Sep 17 00:00:00 2001 From: Bartek Wajda Date: Wed, 29 Oct 2025 10:09:19 +0100 Subject: [PATCH 1/2] IBX-10764: Replace parameters with env variables to account for Cloud configuration --- .../5.0/config/packages/cache_pool/cache.redis.yaml | 4 ++-- ibexa/commerce/5.0/config/packages/dfs/dfs.yaml | 12 ++++++------ .../5.0/config/packages/ibexa_elasticsearch.yaml | 4 ++-- ibexa/commerce/5.0/config/packages/ibexa_solr.yaml | 4 ++-- .../5.0/config/packages/cache_pool/cache.redis.yaml | 4 ++-- ibexa/experience/5.0/config/packages/dfs/dfs.yaml | 12 ++++++------ .../5.0/config/packages/ibexa_elasticsearch.yaml | 4 ++-- ibexa/experience/5.0/config/packages/ibexa_solr.yaml | 4 ++-- .../5.0/config/packages/cache_pool/cache.redis.yaml | 4 ++-- ibexa/headless/5.0/config/packages/dfs/dfs.yaml | 12 ++++++------ .../5.0/config/packages/ibexa_elasticsearch.yaml | 4 ++-- ibexa/headless/5.0/config/packages/ibexa_solr.yaml | 4 ++-- .../5.0/config/packages/cache_pool/cache.redis.yaml | 4 ++-- ibexa/oss/5.0/config/packages/dfs/dfs.yaml | 12 ++++++------ ibexa/oss/5.0/config/packages/ibexa_solr.yaml | 4 ++-- 15 files changed, 46 insertions(+), 46 deletions(-) diff --git a/ibexa/commerce/5.0/config/packages/cache_pool/cache.redis.yaml b/ibexa/commerce/5.0/config/packages/cache_pool/cache.redis.yaml index 458a7b96..c44c1d91 100644 --- a/ibexa/commerce/5.0/config/packages/cache_pool/cache.redis.yaml +++ b/ibexa/commerce/5.0/config/packages/cache_pool/cache.redis.yaml @@ -6,8 +6,8 @@ # For further reading on setup with Ibexa and Redis: # https://doc.ibexa.co/en/latest/guide/persistence_cache/#redis parameters: - cache_namespace: '%env(CACHE_NAMESPACE)%' - cache_dsn: '%env(CACHE_DSN)%' + cache_namespace: '%env(string:CACHE_NAMESPACE)%' + cache_dsn: '%env(string:CACHE_DSN)%' services: cache.redis: diff --git a/ibexa/commerce/5.0/config/packages/dfs/dfs.yaml b/ibexa/commerce/5.0/config/packages/dfs/dfs.yaml index 6a5fe867..9eb550a1 100644 --- a/ibexa/commerce/5.0/config/packages/dfs/dfs.yaml +++ b/ibexa/commerce/5.0/config/packages/dfs/dfs.yaml @@ -2,7 +2,7 @@ parameters: env(DFS_DATABASE_URL): '%env(resolve:DATABASE_URL)%' dfs_database_url: '%env(resolve:DFS_DATABASE_URL)%' ibexa.io.nfs.adapter.config: - root: '%dfs_nfs_path%' + root: '%kernel.project_dir%/%env(string:DFS_NFS_PATH)%' path: '$var_dir$/$storage_dir$/' writeFlags: ~ linkHandling: ~ @@ -14,12 +14,12 @@ doctrine: connections: dfs: # configure these for your database server - driver: '%dfs_database_driver%' - charset: '%dfs_database_charset%' + driver: '%env(string:DFS_DATABASE_DRIVER)%' + charset: '%env(string:DFS_DATABASE_CHARSET)%' default_table_options: - charset: '%dfs_database_charset%' - collate: '%dfs_database_collation%' - url: '%dfs_database_url%' + charset: '%env(string:DFS_DATABASE_CHARSET)%' + collate: '%env(string:DFS_DATABASE_COLLATION)%' + url: '%env(string:DFS_DATABASE_URL)%' # define the flysystem handler oneup_flysystem: diff --git a/ibexa/commerce/5.0/config/packages/ibexa_elasticsearch.yaml b/ibexa/commerce/5.0/config/packages/ibexa_elasticsearch.yaml index da0ba27c..0f3ec4af 100644 --- a/ibexa/commerce/5.0/config/packages/ibexa_elasticsearch.yaml +++ b/ibexa/commerce/5.0/config/packages/ibexa_elasticsearch.yaml @@ -1,7 +1,7 @@ # Base configuration for Elasticsearch parameters: - env(ELASTICSEARCH_URL): '%env(ELASTICSEARCH_DSN)%' - elasticsearch_dsn: "%env(ELASTICSEARCH_URL)%" + env(ELASTICSEARCH_URL): '%env(string:ELASTICSEARCH_DSN)%' + elasticsearch_dsn: "%env(string:ELASTICSEARCH_URL)%" ibexa_elasticsearch: connections: diff --git a/ibexa/commerce/5.0/config/packages/ibexa_solr.yaml b/ibexa/commerce/5.0/config/packages/ibexa_solr.yaml index 5f6370e8..e9b61079 100644 --- a/ibexa/commerce/5.0/config/packages/ibexa_solr.yaml +++ b/ibexa/commerce/5.0/config/packages/ibexa_solr.yaml @@ -3,8 +3,8 @@ ibexa_solr: endpoints: endpoint0: - dsn: '%solr_dsn%' - core: '%solr_core%' + dsn: '%env(string:SOLR_DSN)%' + core: '%env(string:SOLR_CORE)%' connections: default: entry_endpoints: diff --git a/ibexa/experience/5.0/config/packages/cache_pool/cache.redis.yaml b/ibexa/experience/5.0/config/packages/cache_pool/cache.redis.yaml index 458a7b96..c44c1d91 100644 --- a/ibexa/experience/5.0/config/packages/cache_pool/cache.redis.yaml +++ b/ibexa/experience/5.0/config/packages/cache_pool/cache.redis.yaml @@ -6,8 +6,8 @@ # For further reading on setup with Ibexa and Redis: # https://doc.ibexa.co/en/latest/guide/persistence_cache/#redis parameters: - cache_namespace: '%env(CACHE_NAMESPACE)%' - cache_dsn: '%env(CACHE_DSN)%' + cache_namespace: '%env(string:CACHE_NAMESPACE)%' + cache_dsn: '%env(string:CACHE_DSN)%' services: cache.redis: diff --git a/ibexa/experience/5.0/config/packages/dfs/dfs.yaml b/ibexa/experience/5.0/config/packages/dfs/dfs.yaml index 6a5fe867..9eb550a1 100644 --- a/ibexa/experience/5.0/config/packages/dfs/dfs.yaml +++ b/ibexa/experience/5.0/config/packages/dfs/dfs.yaml @@ -2,7 +2,7 @@ parameters: env(DFS_DATABASE_URL): '%env(resolve:DATABASE_URL)%' dfs_database_url: '%env(resolve:DFS_DATABASE_URL)%' ibexa.io.nfs.adapter.config: - root: '%dfs_nfs_path%' + root: '%kernel.project_dir%/%env(string:DFS_NFS_PATH)%' path: '$var_dir$/$storage_dir$/' writeFlags: ~ linkHandling: ~ @@ -14,12 +14,12 @@ doctrine: connections: dfs: # configure these for your database server - driver: '%dfs_database_driver%' - charset: '%dfs_database_charset%' + driver: '%env(string:DFS_DATABASE_DRIVER)%' + charset: '%env(string:DFS_DATABASE_CHARSET)%' default_table_options: - charset: '%dfs_database_charset%' - collate: '%dfs_database_collation%' - url: '%dfs_database_url%' + charset: '%env(string:DFS_DATABASE_CHARSET)%' + collate: '%env(string:DFS_DATABASE_COLLATION)%' + url: '%env(string:DFS_DATABASE_URL)%' # define the flysystem handler oneup_flysystem: diff --git a/ibexa/experience/5.0/config/packages/ibexa_elasticsearch.yaml b/ibexa/experience/5.0/config/packages/ibexa_elasticsearch.yaml index da0ba27c..0f3ec4af 100644 --- a/ibexa/experience/5.0/config/packages/ibexa_elasticsearch.yaml +++ b/ibexa/experience/5.0/config/packages/ibexa_elasticsearch.yaml @@ -1,7 +1,7 @@ # Base configuration for Elasticsearch parameters: - env(ELASTICSEARCH_URL): '%env(ELASTICSEARCH_DSN)%' - elasticsearch_dsn: "%env(ELASTICSEARCH_URL)%" + env(ELASTICSEARCH_URL): '%env(string:ELASTICSEARCH_DSN)%' + elasticsearch_dsn: "%env(string:ELASTICSEARCH_URL)%" ibexa_elasticsearch: connections: diff --git a/ibexa/experience/5.0/config/packages/ibexa_solr.yaml b/ibexa/experience/5.0/config/packages/ibexa_solr.yaml index 36ff22cf..7789371b 100644 --- a/ibexa/experience/5.0/config/packages/ibexa_solr.yaml +++ b/ibexa/experience/5.0/config/packages/ibexa_solr.yaml @@ -4,8 +4,8 @@ ibexa_solr: endpoints: endpoint0: - dsn: '%solr_dsn%' - core: '%solr_core%' + dsn: '%env(string:SOLR_DSN)%' + core: '%env(string:SOLR_CORE)%' connections: default: entry_endpoints: diff --git a/ibexa/headless/5.0/config/packages/cache_pool/cache.redis.yaml b/ibexa/headless/5.0/config/packages/cache_pool/cache.redis.yaml index 458a7b96..c44c1d91 100644 --- a/ibexa/headless/5.0/config/packages/cache_pool/cache.redis.yaml +++ b/ibexa/headless/5.0/config/packages/cache_pool/cache.redis.yaml @@ -6,8 +6,8 @@ # For further reading on setup with Ibexa and Redis: # https://doc.ibexa.co/en/latest/guide/persistence_cache/#redis parameters: - cache_namespace: '%env(CACHE_NAMESPACE)%' - cache_dsn: '%env(CACHE_DSN)%' + cache_namespace: '%env(string:CACHE_NAMESPACE)%' + cache_dsn: '%env(string:CACHE_DSN)%' services: cache.redis: diff --git a/ibexa/headless/5.0/config/packages/dfs/dfs.yaml b/ibexa/headless/5.0/config/packages/dfs/dfs.yaml index 6a5fe867..9eb550a1 100644 --- a/ibexa/headless/5.0/config/packages/dfs/dfs.yaml +++ b/ibexa/headless/5.0/config/packages/dfs/dfs.yaml @@ -2,7 +2,7 @@ parameters: env(DFS_DATABASE_URL): '%env(resolve:DATABASE_URL)%' dfs_database_url: '%env(resolve:DFS_DATABASE_URL)%' ibexa.io.nfs.adapter.config: - root: '%dfs_nfs_path%' + root: '%kernel.project_dir%/%env(string:DFS_NFS_PATH)%' path: '$var_dir$/$storage_dir$/' writeFlags: ~ linkHandling: ~ @@ -14,12 +14,12 @@ doctrine: connections: dfs: # configure these for your database server - driver: '%dfs_database_driver%' - charset: '%dfs_database_charset%' + driver: '%env(string:DFS_DATABASE_DRIVER)%' + charset: '%env(string:DFS_DATABASE_CHARSET)%' default_table_options: - charset: '%dfs_database_charset%' - collate: '%dfs_database_collation%' - url: '%dfs_database_url%' + charset: '%env(string:DFS_DATABASE_CHARSET)%' + collate: '%env(string:DFS_DATABASE_COLLATION)%' + url: '%env(string:DFS_DATABASE_URL)%' # define the flysystem handler oneup_flysystem: diff --git a/ibexa/headless/5.0/config/packages/ibexa_elasticsearch.yaml b/ibexa/headless/5.0/config/packages/ibexa_elasticsearch.yaml index da0ba27c..0f3ec4af 100644 --- a/ibexa/headless/5.0/config/packages/ibexa_elasticsearch.yaml +++ b/ibexa/headless/5.0/config/packages/ibexa_elasticsearch.yaml @@ -1,7 +1,7 @@ # Base configuration for Elasticsearch parameters: - env(ELASTICSEARCH_URL): '%env(ELASTICSEARCH_DSN)%' - elasticsearch_dsn: "%env(ELASTICSEARCH_URL)%" + env(ELASTICSEARCH_URL): '%env(string:ELASTICSEARCH_DSN)%' + elasticsearch_dsn: "%env(string:ELASTICSEARCH_URL)%" ibexa_elasticsearch: connections: diff --git a/ibexa/headless/5.0/config/packages/ibexa_solr.yaml b/ibexa/headless/5.0/config/packages/ibexa_solr.yaml index b6135c05..d1905452 100644 --- a/ibexa/headless/5.0/config/packages/ibexa_solr.yaml +++ b/ibexa/headless/5.0/config/packages/ibexa_solr.yaml @@ -4,8 +4,8 @@ ibexa_solr: endpoints: endpoint0: - dsn: '%solr_dsn%' - core: '%solr_core%' + dsn: '%env(string:SOLR_DSN)%' + core: '%env(string:SOLR_CORE)%' connections: default: entry_endpoints: diff --git a/ibexa/oss/5.0/config/packages/cache_pool/cache.redis.yaml b/ibexa/oss/5.0/config/packages/cache_pool/cache.redis.yaml index 458a7b96..c44c1d91 100644 --- a/ibexa/oss/5.0/config/packages/cache_pool/cache.redis.yaml +++ b/ibexa/oss/5.0/config/packages/cache_pool/cache.redis.yaml @@ -6,8 +6,8 @@ # For further reading on setup with Ibexa and Redis: # https://doc.ibexa.co/en/latest/guide/persistence_cache/#redis parameters: - cache_namespace: '%env(CACHE_NAMESPACE)%' - cache_dsn: '%env(CACHE_DSN)%' + cache_namespace: '%env(string:CACHE_NAMESPACE)%' + cache_dsn: '%env(string:CACHE_DSN)%' services: cache.redis: diff --git a/ibexa/oss/5.0/config/packages/dfs/dfs.yaml b/ibexa/oss/5.0/config/packages/dfs/dfs.yaml index 24eb696d..052ea04b 100644 --- a/ibexa/oss/5.0/config/packages/dfs/dfs.yaml +++ b/ibexa/oss/5.0/config/packages/dfs/dfs.yaml @@ -2,7 +2,7 @@ parameters: env(DFS_DATABASE_URL): '%env(resolve:DATABASE_URL)%' dfs_database_url: '%env(resolve:DFS_DATABASE_URL)%' ibexa.io.nfs.adapter.config: - root: '%dfs_nfs_path%' + root: '%kernel.project_dir%/%env(string:DFS_NFS_PATH)%' path: '$var_dir$/$storage_dir$/' writeFlags: ~ linkHandling: ~ @@ -14,12 +14,12 @@ doctrine: connections: dfs: # configure these for your database server - driver: '%dfs_database_driver%' - charset: '%dfs_database_charset%' + driver: '%env(string:DFS_DATABASE_DRIVER)%' + charset: '%env(string:DFS_DATABASE_CHARSET)%' default_table_options: - charset: '%dfs_database_charset%' - collate: '%dfs_database_collation%' - url: '%dfs_database_url%' + charset: '%env(string:DFS_DATABASE_CHARSET)%' + collate: '%env(string:DFS_DATABASE_COLLATION)%' + url: '%env(string:DFS_DATABASE_URL)%' # define the flysystem handler oneup_flysystem: diff --git a/ibexa/oss/5.0/config/packages/ibexa_solr.yaml b/ibexa/oss/5.0/config/packages/ibexa_solr.yaml index 36ff22cf..7789371b 100644 --- a/ibexa/oss/5.0/config/packages/ibexa_solr.yaml +++ b/ibexa/oss/5.0/config/packages/ibexa_solr.yaml @@ -4,8 +4,8 @@ ibexa_solr: endpoints: endpoint0: - dsn: '%solr_dsn%' - core: '%solr_core%' + dsn: '%env(string:SOLR_DSN)%' + core: '%env(string:SOLR_CORE)%' connections: default: entry_endpoints: From fdf34a8913c4ac3ab01d29b01e67cc6f2835ae5e Mon Sep 17 00:00:00 2001 From: Bartek Wajda Date: Sat, 29 Nov 2025 20:46:46 +0100 Subject: [PATCH 2/2] IBX-10764: Used `SEARCH_ENGINE` env variable in search engine configuration --- ibexa/commerce/5.0/config/packages/ibexa.yaml | 5 +---- ibexa/experience/5.0/config/packages/ibexa.yaml | 5 +---- ibexa/headless/5.0/config/packages/ibexa.yaml | 5 +---- ibexa/oss/5.0/config/packages/ibexa.yaml | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/ibexa/commerce/5.0/config/packages/ibexa.yaml b/ibexa/commerce/5.0/config/packages/ibexa.yaml index 3557f3d4..853c395e 100644 --- a/ibexa/commerce/5.0/config/packages/ibexa.yaml +++ b/ibexa/commerce/5.0/config/packages/ibexa.yaml @@ -4,9 +4,6 @@ parameters: # You can uncomment following parameters to override the setting. # Their values correspond to the defaults being used. - # One of `legacy` (default) or `solr` - #search_engine: '%env(SEARCH_ENGINE)%' - # Session save path as used by symfony session handlers (eg. used for dsn with redis) #ibexa.session.save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%' @@ -60,7 +57,7 @@ ibexa: default: storage: ~ search: - engine: '%search_engine%' + engine: "%env(string:SEARCH_ENGINE)%" connection: default product_catalog: engine: default diff --git a/ibexa/experience/5.0/config/packages/ibexa.yaml b/ibexa/experience/5.0/config/packages/ibexa.yaml index 8ff95cf4..cc88000e 100644 --- a/ibexa/experience/5.0/config/packages/ibexa.yaml +++ b/ibexa/experience/5.0/config/packages/ibexa.yaml @@ -4,9 +4,6 @@ parameters: # You can uncomment following parameters to override the setting. # Their values correspond to the defaults being used. - # One of `legacy` (default) or `solr` - #search_engine: '%env(SEARCH_ENGINE)%' - # Session save path as used by symfony session handlers (eg. used for dsn with redis) #ibexa.session.save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%' @@ -60,7 +57,7 @@ ibexa: default: storage: ~ search: - engine: '%search_engine%' + engine: "%env(string:SEARCH_ENGINE)%" connection: default product_catalog: engine: default diff --git a/ibexa/headless/5.0/config/packages/ibexa.yaml b/ibexa/headless/5.0/config/packages/ibexa.yaml index 6f71c570..3c84ffea 100644 --- a/ibexa/headless/5.0/config/packages/ibexa.yaml +++ b/ibexa/headless/5.0/config/packages/ibexa.yaml @@ -4,9 +4,6 @@ parameters: # You can uncomment following parameters to override the setting. # Their values correspond to the defaults being used. - # One of `legacy` (default) or `solr` - #search_engine: '%env(SEARCH_ENGINE)%' - # Session save path as used by symfony session handlers (eg. used for dsn with redis) #ibexa.session.save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%' @@ -49,7 +46,7 @@ ibexa: default: storage: ~ search: - engine: '%search_engine%' + engine: "%env(string:SEARCH_ENGINE)%" connection: default product_catalog: engine: default diff --git a/ibexa/oss/5.0/config/packages/ibexa.yaml b/ibexa/oss/5.0/config/packages/ibexa.yaml index e1827d75..b157f584 100644 --- a/ibexa/oss/5.0/config/packages/ibexa.yaml +++ b/ibexa/oss/5.0/config/packages/ibexa.yaml @@ -4,9 +4,6 @@ parameters: # You can uncomment following parameters to override the setting. # Their values correspond to the defaults being used. - # One of `legacy` (default) or `solr` - #search_engine: '%env(SEARCH_ENGINE)%' - # Session save path as used by symfony session handlers (eg. used for dsn with redis) #ibexa.session.save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%' @@ -49,7 +46,7 @@ ibexa: default: storage: ~ search: - engine: '%search_engine%' + engine: "%env(string:SEARCH_ENGINE)%" connection: default # Siteaccess configuration, with one siteaccess per default