Compare commits

..

No commits in common. "b9dfa67309b275073a068d2e53538efbc57d1138" and "e935efbc9d44f49ec5dd82e2423011978e332d5c" have entirely different histories.

2 changed files with 13 additions and 22 deletions

View File

@ -13,7 +13,6 @@
recommendedOptimisation = true; recommendedOptimisation = true;
recommendedProxySettings = true; recommendedProxySettings = true;
recommendedTlsSettings = true; recommendedTlsSettings = true;
sslProtocols = "TLSv1.3";
virtualHosts."architect.devs.giugl.io" = { virtualHosts."architect.devs.giugl.io" = {
default = true; default = true;

View File

@ -7,21 +7,18 @@ let
network = import ./network.nix; network = import ./network.nix;
in in
{ {
architect.firewall = {
openTCP = [ 5222 5269 ];
};
services = { services = {
prosody = { prosody = {
enable = true; enable = true;
virtualHosts.${domain} = { virtualHosts = {
inherit domain; "${domain}" = {
domain = domain;
enabled = true; enabled = true;
ssl.key = "${config.security.acme.certs.${domain}.directory}/key.pem"; ssl.key = "${config.security.acme.certs.${domain}.directory}/key.pem";
ssl.cert = ssl.cert =
"${config.security.acme.certs.${domain}.directory}/fullchain.pem"; "${config.security.acme.certs.${domain}.directory}/fullchain.pem";
}; };
};
muc = [{ domain = conference_domain; }]; muc = [{ domain = conference_domain; }];
uploadHttp = { domain = upload_domain; }; uploadHttp = { domain = upload_domain; };
@ -30,16 +27,11 @@ in
#httpInterfaces = [ "wg0" ]; #httpInterfaces = [ "wg0" ];
#httpsInterfaces = [ "wg0" ]; #httpsInterfaces = [ "wg0" ];
}; };
};
nginx.virtualHosts = { services.nginx.virtualHosts."${domain}".enableACME = true;
"${domain}" = { #services.nginx.virtualHosts."${conference_domain}".enableACME = true;
enableACME = true; #services.nginx.virtualHosts."${upload_domain}".enableACME = true;
forceSSL = true;
};
# "${conference_domain}".enableACME = true;
# "${upload_domain}".enableACME = true;
};
};
networking.extraHosts = '' networking.extraHosts = ''
${network.architect-lan} ${domain} ${network.architect-lan} ${domain}