onny/nixos-nextcloud-testumgebung
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upstream maddy mail server module customizations

Browse source
This commit is contained in:
Jonas Heinrich 2023-02-16 23:11:57 +01:00
parent 84be64bec7
commit 8595321b8e
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
vm-nextcloud.nix
View file

@ -4,12 +4,14 @@
{ pkgs, config, lib, options, ... }: { { pkgs, config, lib, options, ... }: {
# FIXME
disabledModules = [ disabledModules = [
"services/web-apps/nextcloud.nix" "services/web-apps/nextcloud.nix"
"services/mail/maddy.nix"
]; ];
imports = [ imports = [
./nextcloud.nix ./nextcloud.nix
"${fetchTarball "https://github.com/onny/nixpkgs/archive/maddy-acc.tar.gz"}/nixos/modules/services/mail/maddy.nix"
]; ];
nixpkgs = { nixpkgs = {
@ -107,6 +109,11 @@
config = lib.concatStrings ( config = lib.concatStrings (
builtins.match "(.*)authorize_sender.*identity\n[ ]+\}(.*)" options.services.maddy.config.default builtins.match "(.*)authorize_sender.*identity\n[ ]+\}(.*)" options.services.maddy.config.default
); );
ensureAccounts = [
"user1@localhost"
"user2@localhost"
"admin@localhost"
];
}; };
# Configure local mail delivery # Configure local mail delivery
@ -127,28 +134,17 @@
# FIXME: Upstream # FIXME: Upstream
systemd.services.maddy-accounts = { systemd.services.maddy-accounts = {
script = '' script = ''
#!${runtimeShell} #!${pkgs.runtimeShell}
if not ${pkgs.maddy}/bin/maddyctl creds list | grep "user1@localhost"; then if ! ${pkgs.maddy}/bin/maddyctl creds list | grep "user1@localhost"; then
${pkgs.maddy}/bin/maddyctl creds create --password test123 user1@localhost ${pkgs.maddy}/bin/maddyctl creds create --password test123 user1@localhost
fi fi
if not ${pkgs.maddy}/bin/maddyctl imap-acct list | grep "user1@localhost"; then if ! ${pkgs.maddy}/bin/maddyctl creds list | grep "user2@localhost"; then
${pkgs.maddy}/bin/maddyctl imap-acct create user1@localhost
fi
if not ${pkgs.maddy}/bin/maddyctl creds list | grep "user2@localhost"; then
${pkgs.maddy}/bin/maddyctl creds create --password test123 user2@localhost ${pkgs.maddy}/bin/maddyctl creds create --password test123 user2@localhost
fi fi
if not ${pkgs.maddy}/bin/maddyctl imap-acct list | grep "user2@localhost"; then if ! ${pkgs.maddy}/bin/maddyctl creds list | grep "admin@localhost"; then
${pkgs.maddy}/bin/maddyctl imap-acct create user2@localhost
fi
if not ${pkgs.maddy}/bin/maddyctl creds list | grep "admin@localhost"; then
${pkgs.maddy}/bin/maddyctl creds create --password test123 admin@localhost ${pkgs.maddy}/bin/maddyctl creds create --password test123 admin@localhost
fi fi
if not ${pkgs.maddy}/bin/maddyctl imap-acct list | grep "admin@localhost"; then
${pkgs.maddy}/bin/maddyctl imap-acct create admin@localhost
fi
''; '';
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";