Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ibexa/commerce/5.0/config/packages/cache_pool/cache.redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions ibexa/commerce/5.0/config/packages/dfs/dfs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ~
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions ibexa/commerce/5.0/config/packages/ibexa_elasticsearch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions ibexa/commerce/5.0/config/packages/ibexa_solr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions ibexa/experience/5.0/config/packages/cache_pool/cache.redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions ibexa/experience/5.0/config/packages/dfs/dfs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ~
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions ibexa/experience/5.0/config/packages/ibexa_elasticsearch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions ibexa/experience/5.0/config/packages/ibexa_solr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions ibexa/headless/5.0/config/packages/cache_pool/cache.redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions ibexa/headless/5.0/config/packages/dfs/dfs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ~
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions ibexa/headless/5.0/config/packages/ibexa_elasticsearch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions ibexa/headless/5.0/config/packages/ibexa_solr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions ibexa/oss/5.0/config/packages/cache_pool/cache.redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions ibexa/oss/5.0/config/packages/dfs/dfs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ~
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions ibexa/oss/5.0/config/packages/ibexa_solr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down