summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortalyz <kim.lindberger@gmail.com>2022-03-31 15:54:45 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-06-27 13:32:54 +0000
commit63ebe71c169c68161a4d544476f21bc8c6986a11 (patch)
tree2d5f50454bf313b258d4aeeb3ddf4e6b139b26df
parentnixos/parsedmarc: Fix compatibility with recent versions of grafana (diff)
downloadnixpkgs-63ebe71c169c68161a4d544476f21bc8c6986a11.tar.gz
nixos/parsedmarc: Remove kafka support
It's broken (see https://github.com/domainaware/parsedmarc/issues/243) and providing settings for it is therefore misleading. (cherry picked from commit 32e057881a5a8e48da2bff645f06a0d09965b5a4)
-rw-r--r--nixos/modules/services/monitoring/parsedmarc.nix58
1 files changed, 0 insertions, 58 deletions
diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix
index 092186b3444d..ae1b2076ad04 100644
--- a/nixos/modules/services/monitoring/parsedmarc.nix
+++ b/nixos/modules/services/monitoring/parsedmarc.nix
@@ -299,63 +299,6 @@ in
'';
};
};
-
- kafka = {
- hosts = lib.mkOption {
- default = [];
- type = with lib.types; listOf str;
- apply = x: if x == [] then null else lib.concatStringsSep "," x;
- description = ''
- A list of Apache Kafka hosts to publish parsed reports
- to.
- '';
- };
-
- user = lib.mkOption {
- type = with lib.types; nullOr str;
- default = null;
- description = ''
- Username to use when connecting to Kafka, if
- required.
- '';
- };
-
- password = lib.mkOption {
- type = with lib.types; nullOr path;
- default = null;
- description = ''
- The path to a file containing the password to use when
- connecting to Kafka, if required.
- '';
- };
-
- ssl = lib.mkOption {
- type = with lib.types; nullOr bool;
- default = null;
- description = ''
- Whether to use an encrypted SSL/TLS connection.
- '';
- };
-
- aggregate_topic = lib.mkOption {
- type = with lib.types; nullOr str;
- default = null;
- example = "aggregate";
- description = ''
- The Kafka topic to publish aggregate reports on.
- '';
- };
-
- forensic_topic = lib.mkOption {
- type = with lib.types; nullOr str;
- default = null;
- example = "forensic";
- description = ''
- The Kafka topic to publish forensic reports on.
- '';
- };
- };
-
};
};
@@ -483,7 +426,6 @@ in
${mkSecretReplacement cfg.settings.smtp.password}
${mkSecretReplacement cfg.settings.imap.password}
${mkSecretReplacement cfg.settings.elasticsearch.password}
- ${mkSecretReplacement cfg.settings.kafka.password}
'' + lib.optionalString cfg.provision.localMail.enable ''
openssl rand -hex 64 >/run/parsedmarc/dmarc_user_passwd
replace-secret '@imap-password@' '/run/parsedmarc/dmarc_user_passwd' /run/parsedmarc/parsedmarc.ini