upRootNutrition/dotfiles
1
0
Fork 0
mirror of https://gitlab.com/upRootNutrition/dotfiles.git synced 2025-06-16 18:15:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: caddy test

Browse source
This commit is contained in:
Nick 2024-12-20 01:20:49 -06:00
parent 12e63f8108
commit c71256d61a
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
config/instances/config/mastodon.nix
View file

@ -1,14 +1,13 @@
{instancesFunctions}: let {instancesFunctions}: let
inherit (instancesFunctions) domain3 servicePath sslPath sopsPath; inherit (instancesFunctions) domain1 servicePath sslPath sopsPath;
mastodonLabel = "Mastodon"; mastodonLabel = "Mastodon";
mastodonName = "mastodon"; mastodonName = "mastodon";
mastodonSubdomain = "social";
in { in {
label = mastodonLabel; label = mastodonLabel;
name = mastodonName; name = mastodonName;
email = { email = {
address0 = "nick@${domain3}"; address0 = "thenutrivore@${domain1}";
}; };
sops = { sops = {
path0 = "${sopsPath}/${mastodonName}"; path0 = "${sopsPath}/${mastodonName}";
@ -18,9 +17,8 @@ in {
path1 = ""; path1 = "";
path2 = ""; path2 = "";
}; };
subdomain = mastodonSubdomain;
ssl = { ssl = {
cert = "${sslPath}/${mastodonSubdomain}.${domain3}/fullchain.pem"; cert = "${sslPath}/${domain1}/fullchain.pem";
key = "${sslPath}/${mastodonSubdomain}.${domain3}/key.pem"; key = "${sslPath}/${domain1}/key.pem";
}; };
} }

2
nixos/modules/services/mastodon/default.nix
View file

@ -8,7 +8,7 @@
inherit (flake.config.machines.devices) server; inherit (flake.config.machines.devices) server;
inherit (flake.config.services.instances) mastodon web; inherit (flake.config.services.instances) mastodon web;
service = mastodon; service = mastodon;
host = "${service.subdomain}.${web.domains.url3}"; host = web.domains.url1;
localhost = web.localhost.address0; localhost = web.localhost.address0;
in { in {
# If you need to start fresh for some reason, run these to create the new Admin account: # If you need to start fresh for some reason, run these to create the new Admin account: