Unverified Commit 1fb02bc8 authored by Jaco Malan's avatar Jaco Malan
Browse files

nixos/monero: add `environmentFile` option

parent 369f15b0

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

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


- `services.ntpd-rs` now performs configuration validation.



- `services.monero` now includes the `environmentFile` option for adding secrets to the Monero daemon config.



- `amdgpu` kernel driver overdrive mode can now be enabled by setting [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable) and customized through [hardware.amdgpu.overdrive.ppfeaturemask](#opt-hardware.amdgpu.overdrive.ppfeaturemask).

  This allows for fine-grained control over the GPU's performance and maybe required by overclocking softwares like Corectrl and Lact. These new options replace old options such as {option}`programs.corectrl.gpuOverclock.enable` and {option}`programs.tuxclocker.enableAMD`.

nixos/modules/services/networking/monero.nix

+33 −1
Original line number Diff line number Diff line
@@ -226,6 +226,30 @@ in 
        '';

      };



      environmentFile = lib.mkOption {

        type = lib.types.nullOr lib.types.path;

        default = null;

        example = "/var/lib/monero/monerod.env";

        description = ''

          Path to an EnvironmentFile for the monero service as defined in {manpage}`systemd.exec(5)`.



          Secrets may be passed to the service by specifying placeholder variables in the Nix config

          and setting values in the environment file.



          Example:



          ```

          # In environment file:

          MINING_ADDRESS=888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwMVgN5S9cQUiyoogDavup3H

          ```



          ```

          # Service config

          services.monero.mining.address = "$MINING_ADDRESS";

          ```

        '';

      };



      extraConfig = lib.mkOption {

        type = lib.types.lines;

        default = "";
@@ -257,10 +281,18 @@ in 
      after = [ "network.target" ];

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



      preStart = ''

        umask 077

        ${pkgs.envsubst}/bin/envsubst \

          -i ${configFile} \

          -o ${cfg.dataDir}/monerod.conf

      '';



      serviceConfig = {

        User = "monero";

        Group = "monero";

        ExecStart = "${lib.getExe' pkgs.monero-cli "monerod"} --config-file=${configFile} --non-interactive";

        EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];

        ExecStart = "${lib.getExe' pkgs.monero-cli "monerod"} --config-file=${cfg.dataDir}/monerod.conf --non-interactive";

        Restart = "always";

        SuccessExitStatus = [

          0