IBX-10764: Replace parameters with env variables to account for Cloud configuration

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:

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:

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

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:

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:

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:

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:

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

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:

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:

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:

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:

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

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:

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:

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:

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:

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

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: