From 856edb67b704aee36c6589d3d3a3ae8cd8d4692b Mon Sep 17 00:00:00 2001 From: "quentin@aristote.fr" Date: Thu, 4 Apr 2024 19:19:49 +0200 Subject: nixos: rss-bridge: fix deprecated option --- modules/nixos/rss-bridge.nix | 46 +++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/modules/nixos/rss-bridge.nix b/modules/nixos/rss-bridge.nix index 8974ae6..a6fcdb7 100644 --- a/modules/nixos/rss-bridge.nix +++ b/modules/nixos/rss-bridge.nix @@ -1,6 +1,10 @@ -{ config, lib, pkgs, ... }: - -let cfg = config.services.rss-bridge; +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.services.rss-bridge; in { options.services.rss-bridge = { package = lib.mkOption { @@ -30,27 +34,33 @@ in { }; }; }); - default = [ ]; + default = []; description = '' A list of additional bridges that aren't already included in RSS-Bridge. These bridges are automatically whitelisted''; }; }; - config.services.rss-bridge.whitelist = - map (bridge: bridge.name) cfg.extraBridges; + config.services.rss-bridge.config.system.enabled_bridges = + lib.mkIf cfg.enable + (map (bridge: bridge.name) cfg.extraBridges); config.services.nginx = lib.mkIf (cfg.virtualHost != null) { - virtualHosts.${cfg.virtualHost}.root = lib.mkIf (cfg.extraBridges != [ ]) - (lib.mkForce (pkgs.runCommand "rss-bridge" { } ('' - mkdir -p $out/bridges - cp -r ${cfg.package}/* $out/ - pushd $out/bridges - '' + lib.concatStrings (map (bridge: '' - ln -sf ${bridge.source} "${bridge.name}Bridge.php" - '') cfg.extraBridges) + '' - popd - '' + lib.optionalString cfg.debug '' - touch $out/DEBUG - ''))); + virtualHosts.${cfg.virtualHost}.root = + lib.mkIf (cfg.extraBridges != []) + (lib.mkForce (pkgs.runCommand "rss-bridge" {} ('' + mkdir -p $out/bridges + cp -r ${cfg.package}/* $out/ + pushd $out/bridges + '' + + lib.concatStrings (map (bridge: '' + ln -sf ${bridge.source} "${bridge.name}Bridge.php" + '') + cfg.extraBridges) + + '' + popd + '' + + lib.optionalString cfg.debug '' + touch $out/DEBUG + ''))); }; } -- cgit v1.2.3