Commit 54716a24 authored by Aidan Gauland's avatar Aidan Gauland
Browse files

Remove dangling NixOS module 

Module `peroxide` has no package.
parent 9bf50ebc

nixos/modules/module-list.nix

+0 −1
Original line number Diff line number Diff line
@@ -1294,7 +1294,6 @@ 
  ./services/networking/pangolin.nix

  ./services/networking/pdns-recursor.nix

  ./services/networking/pdnsd.nix

  ./services/networking/peroxide.nix

  ./services/networking/picosnitch.nix

  ./services/networking/pihole-ftl.nix

  ./services/networking/pixiecore.nix

nixos/modules/services/networking/peroxide.nix

deleted100644 → 0
+0 −149
Original line number Diff line number Diff line 
{

  config,

  lib,

  pkgs,

  ...

}:



with lib;



let

  cfg = config.services.peroxide;

  settingsFormat = pkgs.formats.yaml { };

  stateDir = "peroxide";

in

{

  options.services.peroxide = {

    enable = mkEnableOption "peroxide";



    package = mkPackageOption pkgs "peroxide" {

      default = [ "peroxide" ];

    };



    logLevel = mkOption {

      # https://github.com/sirupsen/logrus#level-logging

      type = types.enum [

        "Panic"

        "Fatal"

        "Error"

        "Warning"

        "Info"

        "Debug"

        "Trace"

      ];

      default = "Warning";

      example = "Info";

      description = "Only log messages of this priority or higher.";

    };



    settings = mkOption {

      type = types.submodule {

        freeformType = settingsFormat.type;



        options = {

          UserPortImap = mkOption {

            type = types.port;

            default = 1143;

            description = "The port on which to listen for IMAP connections.";

          };



          UserPortSmtp = mkOption {

            type = types.port;

            default = 1025;

            description = "The port on which to listen for SMTP connections.";

          };



          ServerAddress = mkOption {

            type = types.str;

            default = "[::0]";

            example = "localhost";

            description = "The address on which to listen for connections.";

          };

        };

      };

      default = { };

      description = ''

        Configuration for peroxide.  See

        [config.example.yaml](https://github.com/ljanyst/peroxide/blob/master/config.example.yaml)

        for an example configuration.

      '';

    };

  };



  config = mkIf cfg.enable {

    services.peroxide.settings = {

      # peroxide deletes the cache directory on startup, which requires write

      # permission on the parent directory, so we can't use

      # /var/cache/peroxide

      CacheDir = "/var/cache/peroxide/cache";

      X509Key = mkDefault "/var/lib/${stateDir}/key.pem";

      X509Cert = mkDefault "/var/lib/${stateDir}/cert.pem";

      CookieJar = "/var/lib/${stateDir}/cookies.json";

      CredentialsStore = "/var/lib/${stateDir}/credentials.json";

    };



    users.users.peroxide = {

      isSystemUser = true;

      group = "peroxide";

    };

    users.groups.peroxide = { };



    systemd.services.peroxide = {

      description = "Peroxide ProtonMail bridge";

      requires = [ "network.target" ];

      after = [ "network.target" ];

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



      restartTriggers = [ config.environment.etc."peroxide.conf".source ];



      serviceConfig = {

        Type = "simple";

        User = "peroxide";

        LogsDirectory = "peroxide";

        LogsDirectoryMode = "0750";

        # Specify just "peroxide" so that the user has write permission, because

        # peroxide deletes and recreates the cache directory on startup.

        CacheDirectory = [

          "peroxide"

          "peroxide/cache"

        ];

        CacheDirectoryMode = "0700";

        StateDirectory = stateDir;

        StateDirectoryMode = "0700";

        ExecStart = "${cfg.package}/bin/peroxide -log-file=/var/log/peroxide/peroxide.log -log-level ${cfg.logLevel}";

        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

      };



      preStart = ''

        # Create a self-signed certificate if no certificate exists.

        if [[ ! -e "${cfg.settings.X509Key}" && ! -e "${cfg.settings.X509Cert}" ]]; then

            ${cfg.package}/bin/peroxide-cfg -action gen-x509 \

              -x509-org 'N/A' \

              -x509-cn 'nixos' \

              -x509-cert "${cfg.settings.X509Cert}" \

              -x509-key "${cfg.settings.X509Key}"

        fi

      '';

    };



    # https://github.com/ljanyst/peroxide/blob/master/peroxide.logrotate

    services.logrotate.settings.peroxide = {

      files = "/var/log/peroxide/peroxide.log";

      rotate = 31;

      frequency = "daily";

      compress = true;

      delaycompress = true;

      missingok = true;

      notifempty = true;

      su = "peroxide peroxide";

      postrotate = "systemctl reload peroxide";

    };



    environment.etc."peroxide.conf".source = settingsFormat.generate "peroxide.conf" cfg.settings;

    environment.systemPackages = [ cfg.package ];

  };



  meta.maintainers = with maintainers; [

    aanderse

  ];

}

nixos/tests/all-tests.nix

+0 −1
Original line number Diff line number Diff line
@@ -1158,7 +1158,6 @@ in 
  peerflix = runTest ./peerflix.nix;

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

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

  peroxide = runTest ./peroxide.nix;

  pgadmin4 = runTest ./pgadmin4.nix;

  pgbackrest = import ./pgbackrest { inherit runTest; };

  pgbouncer = runTest ./pgbouncer.nix;

nixos/tests/peroxide.nix

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
{ pkgs, lib, ... }:

{

  name = "peroxide";

  meta.maintainers = with lib.maintainers; [ aanderse ];



  nodes.machine =

    { config, pkgs, ... }:

    {

      networking.hostName = "nixos";

      services.peroxide.enable = true;

    };



  testScript = ''

    machine.wait_for_unit("peroxide.service")

    machine.wait_for_open_port(1143) # IMAP

    machine.wait_for_open_port(1025) # SMTP

  '';

}