diff --git a/machines/renge/configuration.nix b/machines/renge/configuration.nix index 050ad74..8737e3f 100644 --- a/machines/renge/configuration.nix +++ b/machines/renge/configuration.nix @@ -13,10 +13,8 @@ ./services/grafana.nix ./services/hedgedoc.nix ./services/invidious - ./services/libreddit.nix ./services/matrix ./services/murmur.nix - ./services/nitter.nix ./services/password-hash-self-service.nix ./services/prometheus.nix ./services/psycho-power-papagei.de diff --git a/machines/renge/services/libreddit.nix b/machines/renge/services/libreddit.nix deleted file mode 100644 index 7758a66..0000000 --- a/machines/renge/services/libreddit.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, ... }: -let - cfg = config.services.libreddit; -in -{ - services.libreddit = { - enable = true; - address = "127.0.0.1"; - }; - - services.nginx.virtualHosts."libreddit.sbruder.xyz" = { - extraConfig = '' - allow ${config.sbruder.wireguard.home.subnet}; - deny all; - ''; - locations = { - "/robots.txt".return = "200 'User-agent: *\\nDisallow: /'"; - "/".proxyPass = "http://${cfg.address}:${toString cfg.port}"; - }; - }; -} diff --git a/machines/renge/services/nitter.nix b/machines/renge/services/nitter.nix deleted file mode 100644 index 1a3a9ea..0000000 --- a/machines/renge/services/nitter.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.services.nitter; -in -{ - services.nitter = { - enable = true; - #package = pkgs.unstable.nitter; - server = { - port = 8081; - hostname = "nitter.sbruder.xyz"; - address = "127.0.0.1"; - }; - preferences = { - theme = "Auto"; - replaceTwitter = "${cfg.server.hostname}"; - muteVideos = true; - hlsPlayback = true; - replaceYouTube = "${config.services.invidious.domain}"; - }; - config = { - base64Media = true; - }; - }; - - services.nginx.virtualHosts.${cfg.server.hostname} = { - extraConfig = '' - allow ${config.sbruder.wireguard.home.subnet}; - deny all; - ''; - locations = { - "/robots.txt".return = "200 'User-agent: *\\nDisallow: /'"; - "/" = { - proxyPass = "http://${cfg.server.address}:${toString cfg.server.port}"; - extraConfig = - let - # workaround for nginx dropping parent headers - # see https://github.com/yandex/gixy/blob/master/docs/en/plugins/addheaderredefinition.md - parentHeaders = lib.concatStringsSep "\n" (lib.filter - (lib.hasPrefix "add_header ") - (lib.splitString "\n" config.services.nginx.commonHttpConfig)); - in - '' - ${parentHeaders} - add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' blob:; style-src 'self' 'unsafe-inline'; media-src 'self' blob:"; - ''; - }; - }; - }; -} diff --git a/machines/renge/services/sbruder.xyz/default.nix b/machines/renge/services/sbruder.xyz/default.nix index a81069b..c8e850e 100644 --- a/machines/renge/services/sbruder.xyz/default.nix +++ b/machines/renge/services/sbruder.xyz/default.nix @@ -1,5 +1,9 @@ { config, pkgs, ... }: - +let + goneVhost = { + locations."~ .*".return = "303 'https://sbruder.xyz/#history'"; + }; +in { imports = [ ./blocks.nix @@ -50,4 +54,7 @@ }; }; }; + + services.nginx.virtualHosts."nitter.sbruder.xyz" = goneVhost; + services.nginx.virtualHosts."libreddit.sbruder.xyz" = goneVhost; } diff --git a/machines/renge/services/sbruder.xyz/index.md b/machines/renge/services/sbruder.xyz/index.md index 3e10dfc..480ffad 100644 --- a/machines/renge/services/sbruder.xyz/index.md +++ b/machines/renge/services/sbruder.xyz/index.md @@ -1,8 +1,6 @@ On this domain, the following services are currently available: * [Invidious](https://iv.sbruder.xyz) - * [Libreddit](https://libreddit.sbruder.xyz) - * [Nitter](https://nitter.sbruder.xyz) They are all semi-public instances. That means, they are not included in lists of public instances, @@ -29,6 +27,23 @@ The configuration is available [here](https://git.sbruder.de/simon/nixos-config/ If you have any questions, please [contact me](https://sbruder.de). +## History + +Previously, the following services were also available: + + * [Libreddit](https://libreddit.sbruder.xyz) + * [Nitter](https://nitter.sbruder.xyz) + +They are no longer offered, +as both Twitter (which no longer exists in its previous form) and Reddit +have become extremely hostile to third party applications, +which made them unreliable and forced the developers (at least for Libreddit) +to discontinue development. + +The recommended migration path is to use alternative hosted instances +( has been mostly working at the time of writing this) +or discontinue usage of that platform. + ## A Note to Copyright Holders The services are only relaying content that is otherwise already available on the Internet. @@ -46,7 +61,6 @@ See [Imprint](/imprint/). ## Privacy -The Libreddit and Nitter services do not store your personally identifiable information. If you log in to an Invidious account, the data you provide to the service will be stored. You can export or delete that data by using its built-in data control feature.