pyrox.dev
rss-bridge: 2023-09-24 -> 2024-02-02
Changelog: https://github.com/RSS-Bridge/rss-bridge/releases/tag/2024-02-02
+2
-2
pkgs/servers/web-apps/rss-bridge/default.nix
+2
-2
pkgs/servers/web-apps/rss-bridge/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "rss-bridge";
5
-
version = "2023-09-24";
5
+
version = "2024-02-02";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "RSS-Bridge";
9
9
repo = "rss-bridge";
10
10
rev = version;
11
-
sha256 = "sha256-N1pbveOgJrB1M+WelKD07Jmv9Vz5NqT+IJf//L8UEnU=";
11
+
sha256 = "sha256-VycEgu7uHYwDnNE1eoVxgaWZAnC6mZLBxT8Le3PI4Rs=";
12
12
};
13
13
14
14
patches = [
+18
-23
pkgs/servers/web-apps/rss-bridge/paths.patch
+18
-23
pkgs/servers/web-apps/rss-bridge/paths.patch
···
1
1
diff --git a/lib/Configuration.php b/lib/Configuration.php
2
-
index c38d7cc9..d95e5174 100644
2
+
index 63f67a3c..f0a53a24 100644
3
3
--- a/lib/Configuration.php
4
4
+++ b/lib/Configuration.php
5
-
@@ -104,8 +104,8 @@ final class Configuration
5
+
@@ -81,8 +81,8 @@ public static function loadConfiguration(array $customConfig = [], array $env =
6
6
}
7
7
}
8
8
···
13
13
if ($enabledBridges === '*') {
14
14
self::setConfig('system', 'enabled_bridges', ['*']);
15
15
} else {
16
-
diff --git a/lib/RssBridge.php b/lib/RssBridge.php
17
-
index 6ba952eb..a0bbaf03 100644
18
-
--- a/lib/RssBridge.php
19
-
+++ b/lib/RssBridge.php
20
-
@@ -11,8 +11,8 @@ final class RssBridge
21
-
Configuration::verifyInstallation();
22
-
23
-
$customConfig = [];
24
-
- if (file_exists(__DIR__ . '/../config.ini.php')) {
25
-
- $customConfig = parse_ini_file(__DIR__ . '/../config.ini.php', true, INI_SCANNER_TYPED);
26
-
+ if (file_exists(getenv('RSSBRIDGE_DATA') . '/config.ini.php')) {
27
-
+ $customConfig = parse_ini_file(getenv('RSSBRIDGE_DATA') . '/config.ini.php', true, INI_SCANNER_TYPED);
28
-
}
29
-
Configuration::loadConfiguration($customConfig, getenv());
30
-
31
16
diff --git a/lib/bootstrap.php b/lib/bootstrap.php
32
-
index dc1c0f04..194a3f8f 100644
17
+
index 6465f5f9..4605596f 100644
33
18
--- a/lib/bootstrap.php
34
19
+++ b/lib/bootstrap.php
35
-
@@ -27,7 +27,7 @@ const PATH_LIB_CACHES = __DIR__ . '/../caches/';
36
-
const PATH_LIB_ACTIONS = __DIR__ . '/../actions/';
20
+
@@ -1,7 +1,7 @@
21
+
<?php
37
22
38
-
/** Path to the cache folder */
23
+
const PATH_LIB_CACHES = __DIR__ . '/../caches/';
39
24
-const PATH_CACHE = __DIR__ . '/../cache/';
40
25
+define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/');
41
26
42
-
/** URL to the RSS-Bridge repository */
43
-
const REPOSITORY = 'https://github.com/RSS-Bridge/rss-bridge/';
27
+
// Allow larger files for simple_html_dom
28
+
// todo: extract to config (if possible)
29
+
@@ -43,7 +43,7 @@
30
+
});
31
+
32
+
$customConfig = [];
33
+
-if (file_exists(__DIR__ . '/../config.ini.php')) {
34
+
- $customConfig = parse_ini_file(__DIR__ . '/../config.ini.php', true, INI_SCANNER_TYPED);
35
+
+if (file_exists(getenv('RSSBRIDGE_DATA') . '/config.ini.php')) {
36
+
+ $customConfig = parse_ini_file(getenv('RSSBRIDGE_DATA') . '/config.ini.php', true, INI_SCANNER_TYPED);
37
+
}
38
+
Configuration::loadConfiguration($customConfig, getenv());