feat(freshrss): add rss-bridge with extension
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2024-03-19 09:23:50 -04:00
parent 0e4df9ea74
commit c1b5d2e360
4 changed files with 49 additions and 7 deletions

View file

@ -98,6 +98,7 @@ in {
}; };
# FreshRSS & Co # FreshRSS & Co
bridge.reverseProxy = "${nosIP}:3006";
drss.reverseProxy = "${nosIP}:3007"; drss.reverseProxy = "${nosIP}:3007";
freshrss = { freshrss = {
subDomainName = "rss"; subDomainName = "rss";

View file

@ -1,4 +1,8 @@
{config, ...}: let {
config,
pkgs,
...
}: let
inherit (config.sops) secrets; inherit (config.sops) secrets;
inherit (config.arion) rwDataDir; inherit (config.arion) rwDataDir;
@ -10,10 +14,29 @@ in {
restart = "always"; restart = "always";
ports = ["2800:80"]; ports = ["2800:80"];
extra_hosts = [
"drss.nelim.org=10.0.0.130"
"bridge.nelim.org=10.0.0.130"
];
volumes = [ volumes = let
rss-bridge = pkgs.stdenv.mkDerivation {
name = "rss-bridge-ext";
version = "unstable";
src = pkgs.fetchFromGitHub {
owner = "DevonHess";
repo = "FreshRSS-Extensions";
rev = "299c1febc279be77fa217ff5c2965a620903b974";
hash = "sha256-++kgbrGJohKeOeLjcy7YV3QdCf9GyZDtbntlFmmIC5k=";
};
installPhase = ''
mkdir $out
cp -ar ./xExtension-RssBridge $out/
'';
};
in [
"${rwPath}/data:/var/www/FreshRSS/data" "${rwPath}/data:/var/www/FreshRSS/data"
"${rwPath}/data-extensions:/var/www/FreshRSS/extensions" "${rss-bridge}/xExtension-RssBridge:/var/www/FreshRSS/extensions/xExtension-RssBridge:ro"
]; ];
env_file = [secrets.freshrss.path]; env_file = [secrets.freshrss.path];
@ -46,5 +69,15 @@ in {
restart = "always"; restart = "always";
ports = ["3007:3000"]; ports = ["3007:3000"];
}; };
"rss-bridge" = {
image = ./images/rss-bridge.nix;
restart = "always";
volumes = [
"${rwPath}/bridge:/config"
];
ports = ["3006:80"];
};
}; };
} }

View file

@ -0,0 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "rssbridge/rss-bridge";
imageDigest = "sha256:4fed6d1e549675689a9554f165a26ad3ebf63d0c3673f42429de81927da329a2";
sha256 = "0rxgw6rbis1l8jb1ayqib902c510prgcvvh3w1i5g68m7di5xxm1";
finalImageName = "rssbridge/rss-bridge";
finalImageTag = "latest";
}

View file

@ -1,8 +1,8 @@
pkgs: pkgs:
pkgs.dockerTools.pullImage { pkgs.dockerTools.pullImage {
imageName = "weejewel/wg-easy"; imageName = "ghcr.io/wg-easy/wg-easy";
imageDigest = "sha256:ea65f283dfeb62628ce942ce38974f9db05177aa27ab69b787115b78591552f3"; imageDigest = "sha256:daa94b77901bdef3cb10151416c095e64cf66a6539fa8f748c09812b60b97f49";
sha256 = "1cv9s2pgqxqwp7lq2jzf8l58jn9cdhl3gkql6xjf0v5xgj0wifw1"; sha256 = "02880zh6fdmjlyi9nrvz1vzj4qa5642079xyzpbx3c1rplg033md";
finalImageName = "weejewel/wg-easy"; finalImageName = "ghcr.io/wg-easy/wg-easy";
finalImageTag = "latest"; finalImageTag = "latest";
} }