Unverified Commit 4a75ef3d authored by Artemis Tosini's avatar Artemis Tosini Committed by GitHub
Browse files

nixos/garage: add user-given path to ReadWritePaths (#373114)

parents 151b7f7b 97f27249

nixos/modules/services/web-servers/garage.nix

+32 −22
Original line number Diff line number Diff line
@@ -11,18 +11,14 @@ let 
  cfg = config.services.garage;

  toml = pkgs.formats.toml { };

  configFile = toml.generate "garage.toml" cfg.settings;



  anyHasPrefix =

    prefix: strOrList:

    if isString strOrList then

      hasPrefix prefix strOrList

    else

      any ({ path, ... }: hasPrefix prefix path) strOrList;

in

{

  meta = {

    doc = ./garage.md;

    maintainers = [ maintainers.mjm ];

    maintainers = with lib.maintainers; [

      mjm

      cything

    ];

  };



  options.services.garage = {
@@ -44,13 +40,13 @@ in 
    };



    logLevel = mkOption {

      type = types.enum ([

      type = types.enum [

        "error"

        "warn"

        "info"

        "debug"

        "trace"

      ]);

      ];

      default = "info";

      example = "debug";

      description = "Garage log level, see <https://garagehq.deuxfleurs.fr/documentation/quick-start/#launching-the-garage-server> for examples.";
@@ -125,17 +121,31 @@ in 
      restartTriggers = [

        configFile

      ] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile);

      serviceConfig = {

      serviceConfig =

        let

          paths = lib.flatten (

            with cfg.settings;

            [

              metadata_dir

            ]

            # data_dir can either be a string or a list of attrs

            # if data_dir is a list, the actual path will in in the `path` attribute of each item

            # see https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#data_dir

            ++ lib.optional (lib.isList data_dir) (map (item: item.path) data_dir)

            ++ lib.optional (lib.isString data_dir) [ data_dir ]

          );

          isDefault = lib.hasPrefix "/var/lib/garage";

          isDefaultStateDirectory = lib.any isDefault paths;

        in

        {

          ExecStart = "${cfg.package}/bin/garage server";



        StateDirectory = mkIf (

          anyHasPrefix "/var/lib/garage" cfg.settings.data_dir

          || hasPrefix "/var/lib/garage" cfg.settings.metadata_dir

        ) "garage";

          StateDirectory = lib.mkIf isDefaultStateDirectory "garage";

          DynamicUser = lib.mkDefault true;

          ProtectHome = true;

          NoNewPrivileges = true;

          EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile;

          ReadWritePaths = lib.filter (x: !(isDefault x)) (lib.flatten [ paths ]);

        };

      environment = {

        RUST_LOG = lib.mkDefault "garage=${cfg.logLevel}";