hyl.st
1diff --git a/app/AppKernel.php b/app/AppKernel.php
2index 61b734e06..0902c20fc 100644
3--- a/app/AppKernel.php
4+++ b/app/AppKernel.php
5@@ -64,12 +64,12 @@ class AppKernel extends Kernel
6
7 public function getCacheDir()
8 {
9- return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
10+ return getenv('CACHE_DIRECTORY') . '/' . $this->getEnvironment();
11 }
12
13 public function getLogDir()
14 {
15- return dirname(__DIR__) . '/var/logs';
16+ return getenv('LOGS_DIRECTORY');
17 }
18
19 public function registerContainerConfiguration(LoaderInterface $loader)
20diff --git a/app/config/config.yml b/app/config/config.yml
21index 7f0a4ca6c..77b5175c8 100644
22--- a/app/config/config.yml
23+++ b/app/config/config.yml
24@@ -1,5 +1,7 @@
25 imports:
26- - { resource: parameters.yml }
27+ # Unfortunately, we cannot use %env(string:CONFIGURATION_DIRECTORY)%. Hardcoding the path for simplicity.
28+ # https://symfony.com/doc/current/service_container/import.html#importing-configuration-with-imports
29+ - { resource: '/etc/wallabag/parameters.yml' }
30 - { resource: security.yml }
31 - { resource: services.yml }
32 - { resource: wallabag.yml }
33@@ -28,7 +30,7 @@ framework:
34 session:
35 # handler_id set to null will use default session handler from php.ini
36 handler_id: session.handler.native_file
37- save_path: "%kernel.project_dir%/var/sessions/%kernel.environment%"
38+ save_path: "%env(string:CACHE_DIRECTORY)%/sessions/%kernel.environment%"
39 cookie_secure: auto
40 fragments: ~
41 http_method_override: true
42diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
43index bd57d6377..8e1cd0970 100644
44--- a/app/config/wallabag.yml
45+++ b/app/config/wallabag.yml
46@@ -35,7 +35,7 @@ wallabag_core:
47 fetching_error_message: |
48 wallabag can't retrieve contents for this article. Please <a href="https://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
49 api_limit_mass_actions: 10
50- encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
51+ encryption_key_path: "%env(string:STATE_DIRECTORY)%/site-credentials-secret-key.txt"
52 default_internal_settings:
53 -
54 name: share_public
55