From cd49e9819bea35a4db05e3e76910b739898c2219 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 22 Mar 2020 16:31:20 +0100
Subject: New core-extensions to allow Docker volumes for third-party
 extensions (#2837)

* New core-extensions to allow Docker volumes for third-party extensions

#Fix https://github.com/FreshRSS/FreshRSS/issues/2650
Split our extensions directory into two:
1) Core extensions shipped with FreshRSS in ./lib/core-extensions/
2) Third-party extensions modified by end-users in ./extensions/ which
can easily be mounted as a Docker volume

* Example of Docker Compose with extensions

* Back-compatibility + fix array merge bug
---
 constants.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'constants.php')

diff --git a/constants.php b/constants.php
index 67e3d2677..65a297e85 100644
--- a/constants.php
+++ b/constants.php
@@ -13,7 +13,7 @@ define('INDEX_PATH', PUBLIC_PATH . PUBLIC_TO_INDEX_PATH);
 define('PUBLIC_RELATIVE', '..');
 define('LIB_PATH', FRESHRSS_PATH . '/lib');
 define('APP_PATH', FRESHRSS_PATH . '/app');
-define('EXTENSIONS_PATH', FRESHRSS_PATH . '/extensions');
+define('CORE_EXTENSIONS_PATH', LIB_PATH . '/core-extensions');
 //</Not customisable>
 
 function safe_define($name, $value) {
@@ -49,6 +49,11 @@ safe_define('API_LOG', USERS_PATH . '/_/log_api.txt');
 safe_define('CACHE_PATH', DATA_PATH . '/cache');
 safe_define('PSHB_LOG', USERS_PATH . '/_/log_pshb.txt');
 safe_define('PSHB_PATH', DATA_PATH . '/PubSubHubbub');
+safe_define('EXTENSIONS_DATA', DATA_PATH . '/extensions-data');
+safe_define('THIRDPARTY_EXTENSIONS_PATH', FRESHRSS_PATH . '/extensions');
+
+//Deprecated constants
+safe_define('EXTENSIONS_PATH', FRESHRSS_PATH . '/extensions');
 
 //Directory used for feed mutex with *.freshrss.lock files. Must be writable.
 safe_define('TMP_PATH', sys_get_temp_dir());
-- 
cgit v1.2.3