Skip to content
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

Jump to bottom

rss-bridge: 2022-06-14 -> 2023-09-24 #257641

Merged
merged 3 commits into from
Oct 22, 2023
Merged

rss-bridge: 2022-06-14 -> 2023-09-24 #257641

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9be52e2
rss-bridge: 2022-06-14 -> 2023-09-24
Mynacol Sep 27, 2023
56ac715
rss-bridge: Move substitutions into patch file
Mynacol Oct 16, 2023
da3c4c2
rss-bridge: add maintainer
Mynacol Oct 22, 2023
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
13 changes: 5 additions & 8 deletions pkgs/servers/web-apps/rss-bridge/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,18 @@

stdenv.mkDerivation rec {
pname = "rss-bridge";
version = "2022-06-14";
version = "2023-09-24";

src = fetchFromGitHub {
owner = "RSS-Bridge";
repo = "rss-bridge";
rev = version;
sha256 = "sha256-yH+m65CIZokZSbnv1zfpKC/Qr/mPPC6dG49Zn62X0l4=";
sha256 = "sha256-N1pbveOgJrB1M+WelKD07Jmv9Vz5NqT+IJf//L8UEnU=";
};

postPatch = ''
substituteInPlace lib/rssbridge.php \
--replace "define('PATH_CACHE', PATH_ROOT . 'cache/');" "define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/');" \
--replace "define('FILE_CONFIG', PATH_ROOT . 'config.ini.php');" "define('FILE_CONFIG', getenv('RSSBRIDGE_DATA') . '/config.ini.php');" \
--replace "define('WHITELIST', PATH_ROOT . 'whitelist.txt');" "define('WHITELIST', getenv('RSSBRIDGE_DATA') . '/whitelist.txt');"
'';
patches = [
./paths.patch
];

installPhase = ''
mkdir $out/
Expand Down
43 changes: 43 additions & 0 deletions pkgs/servers/web-apps/rss-bridge/paths.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
diff --git a/lib/Configuration.php b/lib/Configuration.php
index c38d7cc9..d95e5174 100644
--- a/lib/Configuration.php
+++ b/lib/Configuration.php
@@ -104,8 +104,8 @@ final class Configuration
}
}

- if (file_exists(__DIR__ . '/../whitelist.txt')) {
- $enabledBridges = trim(file_get_contents(__DIR__ . '/../whitelist.txt'));
+ if (file_exists(getenv('RSSBRIDGE_DATA') . '/whitelist.txt')) {
+ $enabledBridges = trim(file_get_contents(getenv('RSSBRIDGE_DATA') . '/whitelist.txt'));
if ($enabledBridges === '*') {
self::setConfig('system', 'enabled_bridges', ['*']);
} else {
diff --git a/lib/RssBridge.php b/lib/RssBridge.php
index 6ba952eb..a0bbaf03 100644
--- a/lib/RssBridge.php
+++ b/lib/RssBridge.php
@@ -11,8 +11,8 @@ final class RssBridge
Configuration::verifyInstallation();

$customConfig = [];
- if (file_exists(__DIR__ . '/../config.ini.php')) {
- $customConfig = parse_ini_file(__DIR__ . '/../config.ini.php', true, INI_SCANNER_TYPED);
+ if (file_exists(getenv('RSSBRIDGE_DATA') . '/config.ini.php')) {
+ $customConfig = parse_ini_file(getenv('RSSBRIDGE_DATA') . '/config.ini.php', true, INI_SCANNER_TYPED);
}
Configuration::loadConfiguration($customConfig, getenv());

diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index dc1c0f04..194a3f8f 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -27,7 +27,7 @@ const PATH_LIB_CACHES = __DIR__ . '/../caches/';
const PATH_LIB_ACTIONS = __DIR__ . '/../actions/';

/** Path to the cache folder */
-const PATH_CACHE = __DIR__ . '/../cache/';
+define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/');

/** URL to the RSS-Bridge repository */
const REPOSITORY = 'https://github.com/RSS-Bridge/rss-bridge/';