Unverified Commit f7a0c71b authored by Guanran Wang's avatar Guanran Wang
Browse files

libreddit: remove as unmaintained upstream

parent 9355fa86

nixos/modules/module-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -758,7 +758,6 @@ 
  ./services/misc/klipper.nix

  ./services/misc/languagetool.nix

  ./services/misc/leaps.nix

  ./services/misc/libreddit.nix

  ./services/misc/lidarr.nix

  ./services/misc/lifecycled.nix

  ./services/misc/llama-cpp.nix
@@ -803,6 +802,7 @@ 
  ./services/misc/pykms.nix

  ./services/misc/radarr.nix

  ./services/misc/readarr.nix

  ./services/misc/redlib.nix

  ./services/misc/redmine.nix

  ./services/misc/renovate.nix

  ./services/misc/ripple-data-api.nix

nixos/modules/services/misc/libreddit.nix→nixos/modules/services/misc/redlib.nix

+9 −5
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
with lib;



let

  cfg = config.services.libreddit;

  cfg = config.services.redlib;



  args = concatStringsSep " " ([

    "--port ${toString cfg.port}"
@@ -11,11 +11,15 @@ let 
  ]);

in

{

  imports = [

    (mkRenamedOptionModule [ "services" "libreddit" ] [ "services" "redlib" ])

  ];



  options = {

    services.libreddit = {

    services.redlib = {

      enable = mkEnableOption "Private front-end for Reddit";



      package = mkPackageOption pkgs "libreddit" { };

      package = mkPackageOption pkgs "redlib" { };



      address = mkOption {

        default = "0.0.0.0";
@@ -34,14 +38,14 @@ in 
      openFirewall = mkOption {

        type = types.bool;

        default = false;

        description = "Open ports in the firewall for the libreddit web interface";

        description = "Open ports in the firewall for the redlib web interface";

      };



    };

  };



  config = mkIf cfg.enable {

    systemd.services.libreddit = {

    systemd.services.redlib = {

        description = "Private front-end for Reddit";

        wantedBy = [ "multi-user.target" ];

        after = [ "network.target" ];

nixos/tests/all-tests.nix

+0 −1
Original line number Diff line number Diff line
@@ -502,7 +502,6 @@ in { 
  leaps = handleTest ./leaps.nix {};

  lemmy = handleTest ./lemmy.nix {};

  libinput = handleTest ./libinput.nix {};

  libreddit = handleTest ./libreddit.nix {};

  librenms = handleTest ./librenms.nix {};

  libresprite = handleTest ./libresprite.nix {};

  libreswan = runTest ./libreswan.nix;

nixos/tests/libreddit.nix

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ lib, ... }:



{

  name = "libreddit";

  meta.maintainers = with lib.maintainers; [ fab ];



  nodes.machine = {

    services.libreddit.enable = true;

    # Test CAP_NET_BIND_SERVICE

    services.libreddit.port = 80;

  };



  testScript = ''

    machine.wait_for_unit("libreddit.service")

    machine.wait_for_open_port(80)

    # Query a page that does not require Internet access

    machine.succeed("curl --fail http://localhost:80/settings")

  '';

})

nixos/tests/redlib.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { 
  meta.maintainers = with lib.maintainers; [ soispha ];



  nodes.machine = {

    services.libreddit = {

    services.redlib = {

      package = pkgs.redlib;

      enable = true;

      # Test CAP_NET_BIND_SERVICE
@@ -12,7 +12,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { 
  };



  testScript = ''

    machine.wait_for_unit("libreddit.service")

    machine.wait_for_unit("redlib.service")

    machine.wait_for_open_port(80)

    # Query a page that does not require Internet access

    machine.succeed("curl --fail http://localhost:80/settings")