Unverified Commit 375ab118 authored by dish's avatar dish Committed by GitHub
Browse files

bluesky-pds: rename from pds (#434864)

parents 7faeef0e 06ec782d

nixos/doc/manual/release-notes/rl-2505.section.md

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th 


- [Fider](https://fider.io/), an open platform to collect and prioritize feedback. Available as [services.fider](#opt-services.fider.enable).



- [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as [services.pds](#opt-services.pds.enable).

- [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as {option}`services.pds`.



- [Anubis](https://github.com/TecharoHQ/anubis), a scraper defense software. Available as [services.anubis](#opt-services.anubis.defaultOptions).

nixos/doc/manual/release-notes/rl-2511.section.md

+2 −0
Original line number Diff line number Diff line
@@ -210,6 +210,8 @@ 


- `services.netbird.server` now uses dedicated packages split out due to relicensing of server components to AGPLv3 with version `0.53.0`,



- `services.pds` has been renamed to `services.bluesky-pds`.



- The new option [networking.ipips](#opt-networking.ipips) has been added to create IP within IP kind of tunnels (including 4in6, ip6ip6 and ipip).

  With the existing [networking.sits](#opt-networking.sits) option (6in4), it is now possible to create all combinations of IPv4 and IPv6 encapsulation.

nixos/modules/module-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -1537,6 +1537,7 @@ 
  ./services/web-apps/audiobookshelf.nix

  ./services/web-apps/baikal.nix

  ./services/web-apps/bluemap.nix

  ./services/web-apps/bluesky-pds.nix

  ./services/web-apps/bookstack.nix

  ./services/web-apps/c2fmzq-server.nix

  ./services/web-apps/calibre-web.nix
@@ -1655,7 +1656,6 @@ 
  ./services/web-apps/openwebrx.nix

  ./services/web-apps/outline.nix

  ./services/web-apps/part-db.nix

  ./services/web-apps/pds.nix

  ./services/web-apps/peering-manager.nix

  ./services/web-apps/peertube-runner.nix

  ./services/web-apps/peertube.nix

nixos/modules/services/web-apps/pds.nix→nixos/modules/services/web-apps/bluesky-pds.nix

+19 −8
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  ...

}:

let

  cfg = config.services.pds;

  cfg = config.services.bluesky-pds;



  inherit (lib)

    getExe
@@ -21,7 +21,7 @@ let 


  pdsadminWrapper =

    let

      cfgSystemd = config.systemd.services.pds.serviceConfig;

      cfgSystemd = config.systemd.services.bluesky-pds.serviceConfig;

    in

    pkgs.writeShellScriptBin "pdsadmin" ''

      DUMMY_PDS_ENV_FILE="$(mktemp)"
@@ -29,15 +29,26 @@ let 
      env "PDS_ENV_FILE=$DUMMY_PDS_ENV_FILE"                                                   \

          ${escapeShellArgs cfgSystemd.Environment}                                            \

          ${concatMapStringsSep " " (envFile: "$(cat ${envFile})") cfgSystemd.EnvironmentFile} \

          ${getExe pkgs.pdsadmin} "$@"

          ${getExe pkgs.bluesky-pdsadmin} "$@"

    '';

in

# All defaults are from https://github.com/bluesky-social/pds/blob/8b9fc24cec5f30066b0d0b86d2b0ba3d66c2b532/installer.sh

{

  options.services.pds = {

  imports = [

    (lib.mkRenamedOptionModule [ "services" "pds" "enable" ] [ "services" "bluesky-pds" "enable" ])

    (lib.mkRenamedOptionModule [ "services" "pds" "package" ] [ "services" "bluesky-pds" "package" ])

    (lib.mkRenamedOptionModule [ "services" "pds" "settings" ] [ "services" "bluesky-pds" "settings" ])

    (lib.mkRenamedOptionModule

      [ "services" "pds" "environmentFiles" ]

      [ "services" "bluesky-pds" "environmentFiles" ]

    )

    (lib.mkRenamedOptionModule [ "services" "pds" "pdsadmin" ] [ "services" "bluesky-pds" "pdsadmin" ])

  ];



  options.services.bluesky-pds = {

    enable = mkEnableOption "pds";



    package = mkPackageOption pkgs "pds" { };

    package = mkPackageOption pkgs "bluesky-pds" { };



    settings = mkOption {

      type = types.submodule {
@@ -154,7 +165,7 @@ in 
      enable = mkOption {

        type = types.bool;

        default = cfg.enable;

        defaultText = literalExpression "config.services.pds.enable";

        defaultText = literalExpression "config.services.bluesky-pds.enable";

        description = "Add pdsadmin script to PATH";

      };

    };
@@ -165,8 +176,8 @@ in 
      systemPackages = [ pdsadminWrapper ];

    };



    systemd.services.pds = {

      description = "pds";

    systemd.services.bluesky-pds = {

      description = "bluesky pds";



      after = [ "network-online.target" ];

      wants = [ "network-online.target" ];

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ in 
  blint = runTest ./blint.nix;

  blockbook-frontend = runTest ./blockbook-frontend.nix;

  blocky = runTest ./blocky.nix;

  bluesky-pds = runTest ./bluesky-pds.nix;

  bookstack = runTest ./bookstack.nix;

  boot = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./boot.nix { };

  bootspec = handleTestOn [ "x86_64-linux" ] ./bootspec.nix { };
@@ -1150,7 +1151,6 @@ in 
  parsedmarc = handleTest ./parsedmarc { };

  password-option-override-ordering = runTest ./password-option-override-ordering.nix;

  pdns-recursor = runTest ./pdns-recursor.nix;

  pds = runTest ./pds.nix;

  peerflix = runTest ./peerflix.nix;

  peering-manager = runTest ./web-apps/peering-manager.nix;

  peertube = handleTestOn [ "x86_64-linux" ] ./web-apps/peertube.nix { };