osbm/flake
1
0
Fork 0
Code Issues Pull requests Wiki Activity

i am so sick of this shit

Browse source
This commit is contained in:
Osman Faruk Bayram 2025-11-05 14:06:27 +03:00
parent 714cfb9c0e
commit 356142e385
3 changed files with 49 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/nixos/apollo/configuration.nix
View file

@ -11,7 +11,7 @@
services = {
glance.enable = true;
# anubis.enable = true;
mailserver.enable = true;
# mailserver.enable = true;
nginx.enable = true;
forgejo.enable = true;
vaultwarden.enable = true;

76
modules/nixos/services/mailserver.nix
View file

@ -39,44 +39,44 @@
&& config.osbmModules.hardware.disko.zfs.root.impermanenceRoot
)
{
environment.persistence."/persist" = {
directories = [
# TODO write justifications for each of these
"/var/lib/dovecot" # owned by root
"/var/lib/postfix" # owned by root
{
directory = "/var/lib/rspamd";
user = "rspamd";
group = "rspamd";
mode = "0750";
}
{
directory = "/var/spool/redis-rspamd";
user = "redis-rspamd";
group = "redis-rspamd";
mode = "0750";
}
{
directory = "/var/sieve";
user = "virtualMail";
group = "virtualMail";
mode = "0770";
}
{
directory = "/var/vmail";
user = "virtualMail";
group = "virtualMail";
mode = "0700";
}
{
directory = "/var/dkim";
user = "rspamd";
group = "rspamd";
mode = "0755";
}
"/var/spool"
];
};
# environment.persistence."/persist" = {
# directories = [
# # TODO write justifications for each of these
# "/var/lib/dovecot" # owned by root
# "/var/lib/postfix" # owned by root
# {
# directory = "/var/lib/rspamd";
# user = "rspamd";
# group = "rspamd";
# mode = "0750";
# }
# {
# directory = "/var/spool/redis-rspamd";
# user = "redis-rspamd";
# group = "redis-rspamd";
# mode = "0750";
# }
# {
# directory = "/var/sieve";
# user = "virtualMail";
# group = "virtualMail";
# mode = "0770";
# }
# {
# directory = "/var/vmail";
# user = "virtualMail";
# group = "virtualMail";
# mode = "0700";
# }
# {
# directory = "/var/dkim";
# user = "rspamd";
# group = "rspamd";
# mode = "0755";
# }
# "/var/spool"
# ];
# };
})
];
}

27
modules/nixos/services/nginx.nix
View file

@ -8,13 +8,6 @@
(lib.mkIf config.osbmModules.services.nginx.enable {
services.nginx = {
enable = true;
# Add virtual host for mail.osbm.dev to handle ACME challenges
virtualHosts."mail.osbm.dev" = lib.mkIf config.osbmModules.services.mailserver.enable {
locations."/.well-known/acme-challenge" = {
root = "/var/lib/acme/acme-challenge";
};
};
};
networking.firewall.allowedTCPPorts = [
@ -34,16 +27,16 @@
&& config.osbmModules.hardware.disko.zfs.root.impermanenceRoot
)
{
environment.persistence."/persist" = {
directories = [
{
directory = "/var/lib/acme";
user = "acme";
group = "nginx";
mode = "0750";
}
];
};
# environment.persistence."/persist" = {
# directories = [
# {
# directory = "/var/lib/acme";
# user = "acme";
# group = "nginx";
# mode = "0750";
# }
# ];
# };
}
)
];