mirror of
https://github.com/Mic92/nixos-wiki-infra.git
synced 2025-06-27 05:01:53 +02:00
Merge pull request #39 from NixOS/joerg-ci
change reply address to match dkim settings
This commit is contained in:
commit
79372f5285
@ -1,4 +1,4 @@
|
|||||||
{ config, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
domain = "wiki.nixos.org";
|
domain = "wiki.nixos.org";
|
||||||
@ -12,9 +12,15 @@ in
|
|||||||
sops.secrets.opendkim-private-key.owner = config.services.postfix.user;
|
sops.secrets.opendkim-private-key.owner = config.services.postfix.user;
|
||||||
|
|
||||||
services.opendkim.keyPath = "/run/opendkim-keys";
|
services.opendkim.keyPath = "/run/opendkim-keys";
|
||||||
systemd.tmpfiles.rules = [
|
systemd.services.opendkim.serviceConfig = {
|
||||||
"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}"
|
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
|
# postfix configuration for sending emails only
|
||||||
services.postfix = {
|
services.postfix = {
|
||||||
|
@ -26,8 +26,8 @@ in
|
|||||||
githubClientId = "Iv1.fcbe65bcecdda275";
|
githubClientId = "Iv1.fcbe65bcecdda275";
|
||||||
githubClientSecretFile = config.sops.secrets.nixos-wiki-github-client-secret.path;
|
githubClientSecretFile = config.sops.secrets.nixos-wiki-github-client-secret.path;
|
||||||
emergencyContact = "wiki@nixos.org";
|
emergencyContact = "wiki@nixos.org";
|
||||||
passwordSender = "wiki@nixos.org";
|
passwordSender = "wiki@wiki.nixos.org";
|
||||||
noReplyAddress = "wiki-no-reply@nixos.org";
|
noReplyAddress = "wiki-no-reply@wiki.nixos.org";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.cloud-init.enable = lib.mkForce false;
|
services.cloud-init.enable = lib.mkForce false;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user