Merge remote-tracking branch 'remotes/dev/6.0' into 6.0

Author: CI bot

.env-app

@@ -66,8 +66,24 @@ ORO_REDIS_DOCTRINE_DSN=${ORO_REDIS_URL}/2
 ORO_REDIS_LAYOUT_DSN=${ORO_REDIS_URL}/3
 ###< redis cache config ###
 
+###> tracking data folder config ###
+# Specify path to the folder for tracking data
+ORO_TRACKING_DATA_FOLDER=
+###< tracking data folder config ###
+
 ###> maintenance mode config ###
 # Specify path for the maintenance lock file in the system
 # To activate maintenance mode, run `lexik:maintenance:lock` ORO command
 ORO_MAINTENANCE_LOCK_FILE_PATH=%kernel.project_dir%/var/maintenance/maintenance_lock
 ###< maintenance mode config ###
+
+###> OAuth config ###
+# Specify paths to the public and private keys for OAuth
+ORO_OAUTH_PUBLIC_KEY_PATH='%kernel.project_dir%/var/oauth_public.key'
+ORO_OAUTH_PRIVATE_KEY_PATH='%kernel.project_dir%/var/oauth_private.key'
+###< OAuth config ###
+
+###> logging config ###
+# Specify path to the log file
+ORO_LOG_PATH="%kernel.logs_dir%/%kernel.environment%.log"
+###< logging config ###

config/config_cloud.yml

@@ -4,9 +4,6 @@ imports:
 parameters:
     env(ORO_LOG_PATH): "php://stderr"
 
-    multi_host_operation_directory: '%env(ORO_MULTIHOST_OPERATION_FOLDER)%'
-    env(ORO_MULTIHOST_OPERATION_FOLDER): '%kernel.project_dir%/var/multihost'
-    env(ORO_MULTIHOST_ENABLED): true
 
     sftp_root_path: '%env(ORO_SFTP_ROOT_PATH)%'
     env(ORO_SFTP_ROOT_PATH): '%kernel.project_dir%/var/sftp'