From 5260c8daee219adab6188b794d643c63b1617379 Mon Sep 17 00:00:00 2001 From: Quentin Aristote Date: Sun, 27 Nov 2022 01:14:01 +0100 Subject: services: web: rss: add Mubi bridge --- config/services/web/rss/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'config/services/web/rss/default.nix') diff --git a/config/services/web/rss/default.nix b/config/services/web/rss/default.nix index 4d7dd18..776402a 100644 --- a/config/services/web/rss/default.nix +++ b/config/services/web/rss/default.nix @@ -2,12 +2,15 @@ let cfg = config.services.rss-bridge; - debug = false; + debug = true; rss-bridge = pkgs.rss-bridge.overrideAttrs (oldAttrs: oldAttrs // { installPhase = oldAttrs.installPhase + '' - ln -sf ${./ParisJazzClubBridge.php} $out/bridges/ParisJazzClubBridge.php - ln -sf ${./MaisonDeLaRadioBridge.php} $out/bridges/MaisonDeLaRadioBridge.php + pushd $out/bridges + ln -sf ${./ParisJazzClubBridge.php} ParisJazzClubBridge.php + ln -sf ${./MaisonDeLaRadioBridge.php} MaisonDeLaRadioBridge.php + ln -sf ${./MubiBridge.php} MubiBridge.php + popd '' + lib.optionalString debug '' touch $out/DEBUG ''; @@ -15,7 +18,7 @@ let in { services.rss-bridge = { enable = true; - whitelist = [ "ParisJazzClub" "MaisonDeLaRadio" ]; + whitelist = [ "ParisJazzClub" "MaisonDeLaRadio" "Mubi" ]; virtualHost = "rss"; }; -- cgit v1.2.3 From b3e31416ccf7cacbac4d2f4efef7dd28fe3ec493 Mon Sep 17 00:00:00 2001 From: Quentin Aristote Date: Sun, 27 Nov 2022 01:18:39 +0100 Subject: services: web: rss: disable debug mode --- config/services/web/rss/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/services/web/rss/default.nix') diff --git a/config/services/web/rss/default.nix b/config/services/web/rss/default.nix index 776402a..8975d14 100644 --- a/config/services/web/rss/default.nix +++ b/config/services/web/rss/default.nix @@ -2,7 +2,7 @@ let cfg = config.services.rss-bridge; - debug = true; + debug = false; rss-bridge = pkgs.rss-bridge.overrideAttrs (oldAttrs: oldAttrs // { installPhase = oldAttrs.installPhase + '' -- cgit v1.2.3 From 0c0affb59873dd265719a7293dfde6f76495c612 Mon Sep 17 00:00:00 2001 From: Quentin Aristote Date: Sun, 27 Nov 2022 13:12:19 +0100 Subject: services: web: rss: Mubi: replace with What's On Mubi --- config/services/web/rss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/services/web/rss/default.nix') diff --git a/config/services/web/rss/default.nix b/config/services/web/rss/default.nix index 8975d14..2c5d515 100644 --- a/config/services/web/rss/default.nix +++ b/config/services/web/rss/default.nix @@ -9,7 +9,7 @@ let pushd $out/bridges ln -sf ${./ParisJazzClubBridge.php} ParisJazzClubBridge.php ln -sf ${./MaisonDeLaRadioBridge.php} MaisonDeLaRadioBridge.php - ln -sf ${./MubiBridge.php} MubiBridge.php + ln -sf ${./WhatsOnMubiBridge.php} WhatsOnMubiBridge.php popd '' + lib.optionalString debug '' touch $out/DEBUG @@ -18,7 +18,7 @@ let in { services.rss-bridge = { enable = true; - whitelist = [ "ParisJazzClub" "MaisonDeLaRadio" "Mubi" ]; + whitelist = [ "ParisJazzClub" "MaisonDeLaRadio" "WhatsOnMubi" ]; virtualHost = "rss"; }; -- cgit v1.2.3 From efa28a3baa12cac85f4cfc8665f1cf8762b9d7ee Mon Sep 17 00:00:00 2001 From: Quentin Aristote Date: Sun, 27 Nov 2022 16:28:24 +0100 Subject: services: web: rss: add fip bridge --- config/services/web/rss/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'config/services/web/rss/default.nix') diff --git a/config/services/web/rss/default.nix b/config/services/web/rss/default.nix index 2c5d515..18a6763 100644 --- a/config/services/web/rss/default.nix +++ b/config/services/web/rss/default.nix @@ -2,13 +2,14 @@ let cfg = config.services.rss-bridge; - debug = false; + debug = true; rss-bridge = pkgs.rss-bridge.overrideAttrs (oldAttrs: oldAttrs // { installPhase = oldAttrs.installPhase + '' pushd $out/bridges ln -sf ${./ParisJazzClubBridge.php} ParisJazzClubBridge.php ln -sf ${./MaisonDeLaRadioBridge.php} MaisonDeLaRadioBridge.php + ln -sf ${./FipAlbumsBridge.php} FipAlbumsBridge.php ln -sf ${./WhatsOnMubiBridge.php} WhatsOnMubiBridge.php popd '' + lib.optionalString debug '' @@ -18,7 +19,7 @@ let in { services.rss-bridge = { enable = true; - whitelist = [ "ParisJazzClub" "MaisonDeLaRadio" "WhatsOnMubi" ]; + whitelist = [ "ParisJazzClub" "MaisonDeLaRadio" "FipAlbumsBridge" "WhatsOnMubi" ]; virtualHost = "rss"; }; -- cgit v1.2.3 From 4a24f168e3fb44073237d9aca95a97e77bdefa3c Mon Sep 17 00:00:00 2001 From: Quentin Aristote Date: Sun, 27 Nov 2022 17:41:34 +0100 Subject: services: web: rss: make configuration into a module --- config/services/web/rss/default.nix | 53 ++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 16 deletions(-) (limited to 'config/services/web/rss/default.nix') diff --git a/config/services/web/rss/default.nix b/config/services/web/rss/default.nix index 18a6763..acc9331 100644 --- a/config/services/web/rss/default.nix +++ b/config/services/web/rss/default.nix @@ -2,31 +2,52 @@ let cfg = config.services.rss-bridge; - debug = true; - rss-bridge = pkgs.rss-bridge.overrideAttrs (oldAttrs: - oldAttrs // { - installPhase = oldAttrs.installPhase + '' - pushd $out/bridges - ln -sf ${./ParisJazzClubBridge.php} ParisJazzClubBridge.php - ln -sf ${./MaisonDeLaRadioBridge.php} MaisonDeLaRadioBridge.php - ln -sf ${./FipAlbumsBridge.php} FipAlbumsBridge.php - ln -sf ${./WhatsOnMubiBridge.php} WhatsOnMubiBridge.php - popd - '' + lib.optionalString debug '' - touch $out/DEBUG - ''; - }); + # debug = true; + # rss-bridge = pkgs.rss-bridge.overrideAttrs (oldAttrs: + # oldAttrs // { + # installPhase = oldAttrs.installPhase + '' + # pushd $out/bridges + # ln -sf ${./ParisJazzClubBridge.php} ParisJazzClubBridge.php + # ln -sf ${./MaisonDeLaRadioBridge.php} MaisonDeLaRadioBridge.php + # ln -sf ${./FipAlbumsBridge.php} FipAlbumsBridge.php + # ln -sf ${./WhatsOnMubiBridge.php} WhatsOnMubiBridge.php + # popd + # '' + lib.optionalString debug '' + # touch $out/DEBUG + # ''; + # }); in { services.rss-bridge = { enable = true; - whitelist = [ "ParisJazzClub" "MaisonDeLaRadio" "FipAlbumsBridge" "WhatsOnMubi" ]; + # whitelist = [ "ParisJazzClub" "MaisonDeLaRadio" "FipAlbumsBridge" "WhatsOnMubi" ]; + extraBridges = [ + # Music + { + name = "FipAlbums"; + source = ./FipAlbumsBridge.php; + } + ## Concerts + { + name = "ParisJazzClub"; + source = ./ParisJazzClubBridge.php; + } + { + name = "MaisonDeLaRadio"; + source = ./MaisonDeLaRadioBridge.php; + } + # Cinema + { + name = "WhatsOnMubi"; + source = ./WhatsOnMubiBridge.php; + } + ]; virtualHost = "rss"; }; services.nginx = lib.mkIf (cfg.virtualHost != null) { virtualHosts.${cfg.virtualHost} = { serverName = "rss.${config.networking.domain}"; - root = lib.mkForce "${rss-bridge}"; + # root = lib.mkForce "${rss-bridge}"; forceSSL = true; enableACME = true; }; -- cgit v1.2.3 From dc278c9ef8377e2405698f17c0406c393465a65a Mon Sep 17 00:00:00 2001 From: Quentin Aristote Date: Sun, 27 Nov 2022 17:46:39 +0100 Subject: services: web: rss: remove extra comments --- config/services/web/rss/default.nix | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'config/services/web/rss/default.nix') diff --git a/config/services/web/rss/default.nix b/config/services/web/rss/default.nix index acc9331..a6da155 100644 --- a/config/services/web/rss/default.nix +++ b/config/services/web/rss/default.nix @@ -2,24 +2,9 @@ let cfg = config.services.rss-bridge; - # debug = true; - # rss-bridge = pkgs.rss-bridge.overrideAttrs (oldAttrs: - # oldAttrs // { - # installPhase = oldAttrs.installPhase + '' - # pushd $out/bridges - # ln -sf ${./ParisJazzClubBridge.php} ParisJazzClubBridge.php - # ln -sf ${./MaisonDeLaRadioBridge.php} MaisonDeLaRadioBridge.php - # ln -sf ${./FipAlbumsBridge.php} FipAlbumsBridge.php - # ln -sf ${./WhatsOnMubiBridge.php} WhatsOnMubiBridge.php - # popd - # '' + lib.optionalString debug '' - # touch $out/DEBUG - # ''; - # }); in { services.rss-bridge = { enable = true; - # whitelist = [ "ParisJazzClub" "MaisonDeLaRadio" "FipAlbumsBridge" "WhatsOnMubi" ]; extraBridges = [ # Music { @@ -47,7 +32,6 @@ in { services.nginx = lib.mkIf (cfg.virtualHost != null) { virtualHosts.${cfg.virtualHost} = { serverName = "rss.${config.networking.domain}"; - # root = lib.mkForce "${rss-bridge}"; forceSSL = true; enableACME = true; }; -- cgit v1.2.3 From 58db771dfbbf71a471ed92b324d2cbe16a1e0b12 Mon Sep 17 00:00:00 2001 From: Quentin Aristote Date: Sun, 27 Nov 2022 20:00:23 +0100 Subject: services: web: rss: add paris-cine.info bridge --- config/services/web/rss/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'config/services/web/rss/default.nix') diff --git a/config/services/web/rss/default.nix b/config/services/web/rss/default.nix index a6da155..f2b667b 100644 --- a/config/services/web/rss/default.nix +++ b/config/services/web/rss/default.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: -let - cfg = config.services.rss-bridge; +let cfg = config.services.rss-bridge; in { services.rss-bridge = { enable = true; @@ -25,6 +24,10 @@ in { name = "WhatsOnMubi"; source = ./WhatsOnMubiBridge.php; } + { + name = "ParisCineInfo"; + source = ./ParisCineInfoBridge.php; + } ]; virtualHost = "rss"; }; -- cgit v1.2.3