Bun/nixos-config
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Catch all the stuff I missed in the server services to get them to build

Browse source
This commit is contained in:
Jimbo 2024-10-15 17:46:44 -04:00
parent 25a3a7e237
commit a5f06865de
44 changed files with 212 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

30
modules/system/services/server/mailserver/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, outputs, ... }:
{ pkgs, config, ... }:
{
imports = [
./nginx
@ -8,8 +8,8 @@
mailserver = rec {
enable = true;
openFirewall = false;
domains = [ "${outputs.secrets.jimDomain}" ];
fqdn = "mx.${outputs.secrets.jimDomain}";
domains = [ "${config.secrets.jimDomain}" ];
fqdn = "mx.${config.secrets.jimDomain}";
certificateScheme = "acme-nginx";
localDnsResolver = false;
redis.port = 1515;
@ -17,29 +17,29 @@
# Dmarc info
dmarcReporting = {
enable = true;
domain = "${outputs.secrets.jimDomain}";
domain = "${config.secrets.jimDomain}";
localpart = "noreply";
organizationName = "Jimbo's Files";
};
# A list of accounts, passwords generated with nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
loginAccounts = {
"noreply@${outputs.secrets.jimDomain}" = {
hashedPasswordFile = pkgs.writeText "noreply" outputs.secrets.noreplyMailHash;
"noreply@${config.secrets.jimDomain}" = {
hashedPasswordFile = pkgs.writeText "noreply" config.secrets.noreplyMailHash;
sendOnly = true;
};
"jimbo@${outputs.secrets.jimDomain}" = {
hashedPasswordFile = pkgs.writeText "jimbo" outputs.secrets.jimboMailHash;
aliases = [ "james@${outputs.secrets.jimDomain}" "contact@${outputs.secrets.jimDomain}" ];
"jimbo@${config.secrets.jimDomain}" = {
hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.jimboMailHash;
aliases = [ "james@${config.secrets.jimDomain}" "contact@${config.secrets.jimDomain}" ];
};
"lunamoonlight@${outputs.secrets.jimDomain}" = {
hashedPasswordFile = pkgs.writeText "luna" outputs.secrets.lunaMailHash;
"lunamoonlight@${config.secrets.jimDomain}" = {
hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash;
};
"freecorn1854@${outputs.secrets.jimDomain}" = {
hashedPasswordFile = pkgs.writeText "freecorn" outputs.secrets.freecornMailHash;
"freecorn1854@${config.secrets.jimDomain}" = {
hashedPasswordFile = pkgs.writeText "freecorn" config.secrets.freecornMailHash;
};
"tinyattack09@${outputs.secrets.jimDomain}" = {
hashedPasswordFile = pkgs.writeText "tiny" outputs.secrets.tinyMailHash;
"tinyattack09@${config.secrets.jimDomain}" = {
hashedPasswordFile = pkgs.writeText "tiny" config.secrets.tinyMailHash;
};
};
};

4
modules/system/services/server/mailserver/nginx/default.nix
View file

@ -1,6 +1,6 @@
{ pkgs, outputs, ... }:
{ pkgs, config, ... }:
{
services.nginx.virtualHosts."mx.${outputs.secrets.jimDomain}" = {
services.nginx.virtualHosts."mx.${config.secrets.jimDomain}" = {
enableACME = true;
forceSSL = true;
locations."/" = {

6
modules/system/services/server/mailserver/roundcube/default.nix
View file

@ -1,10 +1,10 @@
{ pkgs, outputs, ... }:
{ pkgs, config, ... }:
{
services.roundcube = {
enable = true;
hostName = "mail.${outputs.secrets.jimDomain}";
hostName = "mail.${config.secrets.jimDomain}";
extraConfig = ''
$config['smtp_server'] = "tls://mx.${outputs.secrets.jimDomain}";
$config['smtp_server'] = "tls://mx.${config.secrets.jimDomain}";
$config['smtp_user'] = "%u";
$config['smtp_pass'] = "%p";
'';