Merge pull request #39 from NixOS/joerg-ci

change reply address to match dkim settings
This commit is contained in:
lassulus 2024-04-01 18:32:38 +02:00 committed by GitHub
commit 79372f5285
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 6 deletions

View File

@ -1,4 +1,4 @@
{ config, ... }:
{ config, pkgs, ... }:
let
domain = "wiki.nixos.org";
@ -12,9 +12,15 @@ in
sops.secrets.opendkim-private-key.owner = config.services.postfix.user;
services.opendkim.keyPath = "/run/opendkim-keys";
systemd.tmpfiles.rules = [
"f /run/opendkim-keys/${config.services.opendkim.selector}.private 0600 ${config.services.postfix.user} ${config.services.postfix.group} - - - ${config.sops.secrets.opendkim-private-key.path}"
];
systemd.services.opendkim.serviceConfig = {
ExecStartPre = [
(
"+${pkgs.writeShellScript "opendkim-keys" ''
install -o ${config.services.postfix.user} -g ${config.services.postfix.group} -D -m0700 ${config.sops.secrets.opendkim-private-key.path} /run/opendkim-keys/${config.services.opendkim.selector}.private
''}"
)
];
};
# postfix configuration for sending emails only
services.postfix = {

View File

@ -26,8 +26,8 @@ in
githubClientId = "Iv1.fcbe65bcecdda275";
githubClientSecretFile = config.sops.secrets.nixos-wiki-github-client-secret.path;
emergencyContact = "wiki@nixos.org";
passwordSender = "wiki@nixos.org";
noReplyAddress = "wiki-no-reply@nixos.org";
passwordSender = "wiki@wiki.nixos.org";
noReplyAddress = "wiki-no-reply@wiki.nixos.org";
};
services.cloud-init.enable = lib.mkForce false;