diff --git a/flake.lock b/flake.lock index 4c362ce..daae977 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1712745070, - "narHash": "sha256-75kSMjyCD5/IliSPkBcBSBamwPYF30Ddr8Ef2XxDfiE=", + "lastModified": 1711535911, + "narHash": "sha256-SzgDrsyBskLyipFzsKwPOKP9FMgGB+6tUQ0VpeGQ/1Y=", "ref": "refs/heads/main", - "rev": "c2650ecab1c7b9b2e10d690b40e82817d257b53a", - "revCount": 28, + "rev": "80221fa4d735fbc232d97d3384c8af0e40a4e331", + "revCount": 9, "type": "git", "url": "https://git.sondell.org/glennwso/home.git" }, diff --git a/homepage.nix b/homepage.nix index 190b34a..b250c47 100644 --- a/homepage.nix +++ b/homepage.nix @@ -13,7 +13,7 @@ in After="network-online.target"; }; serviceConfig = { - ExecStart = "${homepage}/bin/home-prod -p ${port}"; + ExecStart = "${homepage}/bin/homepage -p ${port}"; User= "sondell"; Type= "simple"; }; diff --git a/mail.nix b/mail.nix index 17f87aa..9e2d483 100644 --- a/mail.nix +++ b/mail.nix @@ -1,8 +1,4 @@ { mailserver , ... }: -let - domain = "sondell.org"; - fqdn = "mail.${domain}"; -in { imports = [ mailserver @@ -10,8 +6,8 @@ in mailserver = { enable = true; - fqdn = fqdn; - domains = [ domain ]; + fqdn = "mail.sondell.org"; + domains = [ "sondell.org" ]; # 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 @@ -27,18 +23,18 @@ in 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.${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"; - ''; - }; + # 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"; + # ''; + # }; }