This commit is contained in:
silver 2024-02-04 20:21:19 +00:00
commit ded0dc5394
9 changed files with 66 additions and 12 deletions

View file

@ -47,13 +47,20 @@ in {
}
];
services.nginx.virtualHosts."${domain}" = {
services.nginx.virtualHosts = {
"${cfg.host.ip}" = {
forceSSL = true;
useACMEHost = "skynet";
locations."/".return = "307 https://skynet.ie";
};
"${domain}" = {
forceSSL = true;
useACMEHost = "skynet";
locations."/" = {
proxyPass = "http://127.0.0.1:${toString config.services.vaultwarden.config.ROCKET_PORT}";
};
};
};
# has ADMIN_TOKEN and SMTP_PASSWORD
age.secrets.bitwarden_details.file = ../../secrets/bitwarden/details.age;

View file

@ -245,6 +245,12 @@ in {
# to provide the certs
services.nginx.virtualHosts = {
"${cfg.host.ip}" = {
forceSSL = true;
useACMEHost = "skynet";
locations."/".return = "307 https://skynet.ie";
};
"mail.skynet.ie" = {
forceSSL = true;
useACMEHost = "mail";

View file

@ -60,6 +60,12 @@ in {
];
services.nginx.virtualHosts = {
"${cfg.host.ip}" = {
forceSSL = true;
useACMEHost = "skynet";
locations."/".return = "307 https://skynet.ie";
};
"${cfg.domain.sub}.skynet.ie" = {
forceSSL = true;
useACMEHost = "skynet";

View file

@ -108,6 +108,12 @@ in {
];
services.nginx.virtualHosts = {
"${cfg.host.ip}" = {
forceSSL = true;
useACMEHost = "skynet";
locations."/".return = "307 https://skynet.ie";
};
# https://config.minecraft.games.skynet.ie
"config.${short_domain}" = {
forceSSL = true;

View file

@ -150,6 +150,12 @@ in {
services.openssh.ports = [22 2222];
services.nginx.virtualHosts = {
"${cfg.host.ip}" = {
forceSSL = true;
useACMEHost = "skynet";
locations."/".return = "307 https://skynet.ie";
};
# main site
"${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = {
forceSSL = true;

View file

@ -108,6 +108,11 @@ in {
};
services.nginx.virtualHosts = {
"${cfg.host.ip}" = {
forceSSL = true;
useACMEHost = "skynet";
locations."/".return = "307 https://skynet.ie";
};
${domain} = {
forceSSL = true;
useACMEHost = "skynet";

View file

@ -68,6 +68,12 @@ in {
systemd.services.nginx.serviceConfig.ProtectHome = "read-only";
services.nginx.virtualHosts = {
"${cfg.host.ip}" = {
forceSSL = true;
useACMEHost = "skynet";
locations."/".return = "307 https://skynet.ie";
};
# main site
"*.users.skynet.ie" = {
forceSSL = true;

View file

@ -93,10 +93,22 @@ in {
};
};
services.nginx.virtualHosts."${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = {
services.nginx = {
enable = true;
group = "acme";
virtualHosts = {
"${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = {
forceSSL = true;
useACMEHost = "skynet";
locations."/".proxyPass = "http://localhost:8000";
};
"${cfg.host.ip}" = {
forceSSL = true;
useACMEHost = "skynet";
locations."/".return = "307 https://skynet.ie";
};
};
};
};
}

View file

@ -107,11 +107,11 @@
},
"locked": {
"host": "gitlab.skynet.ie",
"lastModified": 1698519699,
"narHash": "sha256-GK8NGWeG2gf3z/ktT0rzDVfj1UsaXxDLcSWCz6tsYSY=",
"lastModified": 1706893483,
"narHash": "sha256-x9OWItfCPTQA9klaN2gpaNLdqUVS0beUMdxbjmc7WgE=",
"owner": "compsoc1%2Fcompsoc",
"repo": "presentations%2Fpresentations",
"rev": "7f451b04c5cffda1558e58f65a53dbc89a678446",
"rev": "54d1fd58213e087d63331a0d94ea723617207e20",
"type": "gitlab"
},
"original": {