Unverified Commit da25b238 authored by Lassulus's avatar Lassulus Committed by GitHub
Browse files

Merge pull request #280373 from h7x4/treewide-use-new-tmpfiles-api 

treewide: use new tmpfiles API
parents 4c2c00ad f5d513c5

nixos/modules/programs/regreet.nix

+10 −6
Original line number Diff line number Diff line
@@ -78,11 +78,15 @@ in 
        else settingsFormat.generate "regreet.toml" cfg.settings;

    };



    systemd.tmpfiles.rules = let

    systemd.tmpfiles.settings."10-regreet" = let

      defaultConfig = {

        user = "greeter";

        group = config.users.users.${config.services.greetd.settings.default_session.user}.group;

    in [

      "d /var/log/regreet 0755 greeter ${group} - -"

      "d /var/cache/regreet 0755 greeter ${group} - -"

    ];

        mode = "0755";

      };

    in {

      "/var/log/regreet".d = defaultConfig;

      "/var/cache/regreet".d = defaultConfig;

    };

  };

}

nixos/modules/services/audio/mopidy.nix

+4 −3
Original line number Diff line number Diff line
@@ -70,9 +70,10 @@ in { 


  config = mkIf cfg.enable {



    systemd.tmpfiles.rules = [

      "d '${cfg.dataDir}' - mopidy mopidy - -"

    ];

    systemd.tmpfiles.settings."10-mopidy".${cfg.dataDir}.d = {

      user = "mopidy";

      group = "mopidy";

    };



    systemd.services.mopidy = {

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

nixos/modules/services/mail/mlmmj.nix

+7 −5
Original line number Diff line number Diff line
@@ -143,11 +143,13 @@ in 


    environment.systemPackages = [ pkgs.mlmmj ];



    systemd.tmpfiles.rules = [

      ''d "${stateDir}" -''

      ''d "${spoolDir}/${cfg.listDomain}" -''

      ''Z "${spoolDir}" - "${cfg.user}" "${cfg.group}" -''

    ];

    systemd.tmpfiles.settings."10-mlmmj" = {

      ${stateDir}.d = { };

      "${spoolDir}/${cfg.listDomain}".d = { };

      ${spoolDir}.Z = {

        inherit (cfg) user group;

      };

    };



    systemd.services.mlmmj-maintd = {

      description = "mlmmj maintenance daemon";

nixos/modules/services/mail/postfixadmin.nix

+5 −1
Original line number Diff line number Diff line
@@ -99,7 +99,11 @@ in 
      ${cfg.extraConfig}

    '';



    systemd.tmpfiles.rules = [ "d /var/cache/postfixadmin/templates_c 700 ${user} ${user}" ];

    systemd.tmpfiles.settings."10-postfixadmin"."/var/cache/postfixadmin/templates_c".d = {

      inherit user;

      group = user;

      mode = "700";

    };



    services.nginx = {

      enable = true;

nixos/modules/services/mail/rss2email.nix

+5 −3
Original line number Diff line number Diff line
@@ -95,9 +95,11 @@ in { 


    services.rss2email.config.to = cfg.to;



    systemd.tmpfiles.rules = [

      "d /var/rss2email 0700 rss2email rss2email - -"

    ];

    systemd.tmpfiles.settings."10-rss2email"."/var/rss2email".d = {

      user = "rss2email";

      group = "rss2email";

      mode = "0700";

    };



    systemd.services.rss2email = let

      conf = pkgs.writeText "rss2email.cfg" (lib.generators.toINI {} ({