chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

kinda working.. acme still is throwing fits i think

Browse source
This commit is contained in:
Chris Cochrun 2024-12-27 00:08:12 -06:00
parent d4c6f1752b
commit 90642bdb41
2 changed files with 55 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/mailserver.nix
View file

@ -7,8 +7,10 @@ in
with lib; with lib;
{ {
# services.caddy = { # services.caddy = {
# enable = true;
# virtualHosts = { # virtualHosts = {
# "mail.cochrun.xyz".extraConfig = '' # "mail.cochrun.xyz".extraConfig = ''
# reverse_proxy 8898
# tls internal { # tls internal {
# key_type rsa2048 # key_type rsa2048
# } # }
@ -21,7 +23,7 @@ with lib;
fqdn = fqdn; fqdn = fqdn;
domains = [ dn ]; domains = [ dn ];
enableManageSieve = true; enableManageSieve = true;
mailDirectory = "/home/chris/mailserver/docker-data/mail-data"; # mailDirectory = "/home/chris/mailserver/docker-data/mail-data";
mailboxes = { mailboxes = {
Archive = { Archive = {
auto = "subscribe"; auto = "subscribe";
@ -46,9 +48,9 @@ with lib;
}; };
useFsLayout = true; useFsLayout = true;
hierarchySeparator = "/"; hierarchySeparator = "/";
certificateScheme = "acme-nginx"; certificateScheme = "manual";
# certificateFile = "/var/lib/acme/${fqdn}/fullchain.pem"; certificateFile = "/var/lib/acme/${fqdn}/fullchain.pem";
# keyFile = "/var/lib/acme/${fqdn}/key.pem"; keyFile = "/var/lib/acme/${fqdn}/key.pem";
loginAccounts = { loginAccounts = {
"chris@cochrun.xyz" = { "chris@cochrun.xyz" = {
hashedPasswordFile = "/home/chris/mailp"; hashedPasswordFile = "/home/chris/mailp";
@ -67,9 +69,9 @@ with lib;
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;
defaults.email = "chris@cochrun.xyz"; defaults.email = "chris@cochrun.xyz";
# certs.${fqdn} = { certs.${fqdn} = {
# webroot = "/var/lib/acme/acme-challenge/"; webroot = "/var/lib/acme/acme-challenge/";
# # dnsProvider = "namecheap"; extraDomainNames = [ "cochrun.xyz" ];
# }; };
}; };
} }

70
systems/dalinar/configuration.nix
View file

@ -280,21 +280,21 @@
reverse_proxy localhost:2283 reverse_proxy localhost:2283
''; '';
}; };
virtualHosts = { # virtualHosts = {
"piped.cochrun.xyz".extraConfig = '' # "piped.cochrun.xyz".extraConfig = ''
reverse_proxy http://127.0.0.1:8085 # reverse_proxy http://127.0.0.1:8085
''; # '';
}; # };
virtualHosts = { # virtualHosts = {
"pipedapi.cochrun.xyz".extraConfig = '' # "pipedapi.cochrun.xyz".extraConfig = ''
reverse_proxy http://127.0.0.1:8085 # reverse_proxy http://127.0.0.1:8085
''; # '';
}; # };
virtualHosts = { # virtualHosts = {
"pipedproxy.cochrun.xyz".extraConfig = '' # "pipedproxy.cochrun.xyz".extraConfig = ''
reverse_proxy http://127.0.0.1:8085 # reverse_proxy http://127.0.0.1:8085
''; # '';
}; # };
virtualHosts = { virtualHosts = {
"inv.cochrun.xyz".extraConfig = '' "inv.cochrun.xyz".extraConfig = ''
reverse_proxy http://127.0.0.1:3000 reverse_proxy http://127.0.0.1:3000
@ -348,26 +348,26 @@
} }
''; '';
}; };
virtualHosts = { # virtualHosts = {
"truthmatters.cc".extraConfig = '' # "truthmatters.cc".extraConfig = ''
encode gzip # encode gzip
root * /srv/truthmatters # root * /srv/truthmatters
file_server # file_server
header { # header {
Access-Control-Allow-Origin * # Access-Control-Allow-Origin *
} # }
''; # '';
}; # };
virtualHosts = { # virtualHosts = {
"new.luctorcrc.org".extraConfig = '' # "new.luctorcrc.org".extraConfig = ''
encode gzip # encode gzip
root * /srv/luctorcrc # root * /srv/luctorcrc
file_server # file_server
header { # header {
Access-Control-Allow-Origin * # Access-Control-Allow-Origin *
} # }
''; # '';
}; # };
virtualHosts = { virtualHosts = {
"nc.cochrun.xyz".extraConfig = '' "nc.cochrun.xyz".extraConfig = ''
reverse_proxy localhost:8080 reverse_proxy localhost:8080