From 8e90b46efad775eabb51bdff0eaa75e25ad9e179 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 9 Apr 2024 14:23:32 +0200 Subject: [PATCH 1/3] working: mailserver --- mail.nix | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/mail.nix b/mail.nix index 9e2d483..17f87aa 100644 --- a/mail.nix +++ b/mail.nix @@ -1,4 +1,8 @@ { mailserver , ... }: +let + domain = "sondell.org"; + fqdn = "mail.${domain}"; +in { imports = [ mailserver @@ -6,8 +10,8 @@ mailserver = { enable = true; - fqdn = "mail.sondell.org"; - domains = [ "sondell.org" ]; + fqdn = fqdn; + domains = [ domain ]; # A list of all login accounts. To create the password hashes, use # cat .secrets/nextadminpw | nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' > .secrets/mailpw.hash @@ -23,18 +27,18 @@ certificateScheme = "acme-nginx"; }; - # services.roundcube = { - # enable = true; - # # this is the url of the vhost, not necessarily the same as the fqdn of - # # the mailserver - # hostName = "webmail.sondell.org"; - # extraConfig = '' - # # starttls needed for authentication, so the fqdn required to match - # # the certificate - # $config['smtp_server'] = "tls://${mailserver.fqdn}"; - # $config['smtp_user'] = "%u"; - # $config['smtp_pass'] = "%p"; - # ''; - # }; + services.roundcube = { + enable = true; + # this is the url of the vhost, not necessarily the same as the fqdn of + # the mailserver + hostName = "webmail.${domain}"; + extraConfig = '' + # starttls needed for authentication, so the fqdn required to match + # the certificate + $config['smtp_server'] = "tls://${fqdn}"; + $config['smtp_user'] = "%u"; + $config['smtp_pass'] = "%p"; + ''; + }; } From 09b6116a5b21829d5bada67774f2a401878e0e61 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 10 Apr 2024 11:01:54 +0200 Subject: [PATCH 2/3] new bin name for homepage --- flake.lock | 8 ++++---- homepage.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index daae977..e60a5d4 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1711535911, - "narHash": "sha256-SzgDrsyBskLyipFzsKwPOKP9FMgGB+6tUQ0VpeGQ/1Y=", + "lastModified": 1712669985, + "narHash": "sha256-fmd3xOIM0upqexDJlFQHipi7LNES+/RoN7VHIrGK7EM=", "ref": "refs/heads/main", - "rev": "80221fa4d735fbc232d97d3384c8af0e40a4e331", - "revCount": 9, + "rev": "db7de53f0f029d96055050f474544b96cf7bf904", + "revCount": 23, "type": "git", "url": "https://git.sondell.org/glennwso/home.git" }, diff --git a/homepage.nix b/homepage.nix index b250c47..190b34a 100644 --- a/homepage.nix +++ b/homepage.nix @@ -13,7 +13,7 @@ in After="network-online.target"; }; serviceConfig = { - ExecStart = "${homepage}/bin/homepage -p ${port}"; + ExecStart = "${homepage}/bin/home-prod -p ${port}"; User= "sondell"; Type= "simple"; }; From ecc4a2f61656864c1d2d26915b0cbf86080e7edf Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 10 Apr 2024 12:36:42 +0200 Subject: [PATCH 3/3] homepage update --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index e60a5d4..4c362ce 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1712669985, - "narHash": "sha256-fmd3xOIM0upqexDJlFQHipi7LNES+/RoN7VHIrGK7EM=", + "lastModified": 1712745070, + "narHash": "sha256-75kSMjyCD5/IliSPkBcBSBamwPYF30Ddr8Ef2XxDfiE=", "ref": "refs/heads/main", - "rev": "db7de53f0f029d96055050f474544b96cf7bf904", - "revCount": 23, + "rev": "c2650ecab1c7b9b2e10d690b40e82817d257b53a", + "revCount": 28, "type": "git", "url": "https://git.sondell.org/glennwso/home.git" },