Commit eacd58df authored by Sandro Jäckel's avatar Sandro Jäckel Committed by github-actions[bot]
Browse files

nixos/opendkim: put config file under standard location 

(cherry picked from commit f4971591)
parent ab0bfdbf

nixos/modules/services/mail/opendkim.nix

+9 −3
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ let 
           "-s" cfg.selector

         ] ++ lib.optionals (cfg.configFile != null) [ "-x" cfg.configFile ];



  configFile = pkgs.writeText "opendkim.conf"

    (lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "${name} ${value}") cfg.settings));

in {

  imports = [

    (lib.mkRenamedOptionModule [ "services" "opendkim" "keyFile" ] [ "services" "opendkim" "keyPath" ])
@@ -93,10 +95,14 @@ in { 
      opendkim.gid = config.ids.gids.opendkim;

    };



    environment.systemPackages = [ pkgs.opendkim ];

    environment = {

      etc = lib.mkIf (cfg.settings != { }) {

        "opendkim/opendkim.conf".source = configFile;

      };

      systemPackages = [ pkgs.opendkim ];

    };



    services.opendkim.configFile = lib.mkIf (cfg.settings != { }) (pkgs.writeText "opendkim.conf"

      (lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "${name} ${value}") cfg.settings)));

    services.opendkim.configFile = lib.mkIf (cfg.settings != { }) configFile;



    systemd.tmpfiles.rules = [

      "d '${cfg.keyPath}' - ${cfg.user} ${cfg.group} - -"