sid/sid.ovh
1
0
Fork 0
Code Issues 3 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Compare commits

base: sid:bf829bcc6e84968edcd00b807c713b40a04b4744
Branches Tags
sid:master
sid:develop
sid:feature/overleaf
sid:dns
..
compare: sid:560a08066f71fce4ae7eb9bad4082c99757bef5f
Branches Tags
sid:master
sid:develop
sid:feature/overleaf
sid:dns

No commits in common. "bf829bcc6e84968edcd00b807c713b40a04b4744" and "560a08066f71fce4ae7eb9bad4082c99757bef5f" have entirely different histories.
bf829bcc6e ... 560a08066f

2 changed files with 36 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

55
hosts/sid/services/nginx.nix
View file

@ -19,12 +19,12 @@ in
enable = true; enable = true;
openFirewall = true; openFirewall = true;
forceSSL = ssl; forceSSL = ssl;
virtualHosts."_" = { # virtualHosts."*" = {
forceSSL = false; # forceSSL = false;
locations."/.well-known/acme-challenge/" = { # locations."/.well-known/acme-challenge/" = {
root = "/var/lib/acme/acme-challenge"; # root = "/var/lib/acme/acme-challenge";
}; # };
}; # };
virtualHosts."${constants.services.docs.fqdn}" = mkVirtualHost { virtualHosts."${constants.services.docs.fqdn}" = mkVirtualHost {
inherit ssl; inherit ssl;
address = constants.hosts.rx4.ip; address = constants.hosts.rx4.ip;
@ -40,14 +40,10 @@ in
address = constants.hosts.rx4.ip; address = constants.hosts.rx4.ip;
port = constants.services.miniflux.port; port = constants.services.miniflux.port;
}; };
virtualHosts."${constants.services.netdata.fqdn}" = { # virtualHosts."${constants.services.netdata.fqdn}" = mkVirtualHost {
useACMEHost = "sid-internal"; # inherit ssl;
forceSSL = ssl; # port = constants.services.netdata.port;
locations."/" = { # };
proxyPass = "http://${constants.hosts.rx4.ip}:${toString constants.services.netdata.port}";
proxyWebsockets = true;
};
};
virtualHosts."${constants.services.open-webui-oci.fqdn}" = mkVirtualHost { virtualHosts."${constants.services.open-webui-oci.fqdn}" = mkVirtualHost {
inherit ssl; inherit ssl;
address = constants.hosts.rx4.ip; address = constants.hosts.rx4.ip;
@ -65,23 +61,20 @@ in
address = constants.hosts.rx4.ip; address = constants.hosts.rx4.ip;
port = constants.services.rsshub-oci.port; port = constants.services.rsshub-oci.port;
}; };
virtualHosts."${constants.services.vaultwarden.fqdn}" = { # virtualHosts."${constants.services.vaultwarden.fqdn}" = {
useACMEHost = "sid-internal"; # useACMEHost = "sid-internal";
forceSSL = ssl; # forceSSL = ssl;
locations = { # locations = {
"/" = { # "/" = {
proxyPass = "http://${constants.hosts.rx4.ip}:${toString constants.services.vaultwarden.port}"; # proxyPass = "http://${constants.hosts.rx4.ip}:${toString constants.services.vaultwarden.port}";
}; # };
}; # };
}; # };
virtualHosts."${constants.services.webdav.fqdn}" = { # virtualHosts."${constants.services.webdav.fqdn}" = mkVirtualHost {
useACMEHost = "sid-internal"; # inherit ssl;
forceSSL = ssl; # address = constants.hosts.rx4.ip;
locations."/" = { # port = constants.services.webdav.port;
proxyPass = "http://${constants.hosts.rx4.ip}:${toString constants.services.webdav.port}"; # };
proxyWebsockets = true;
};
};
# FIXME # FIXME
# virtualHosts."print.sid.ovh" = { # virtualHosts."print.sid.ovh" = {
# enableACME = true; # enableACME = true;

25
hosts/sid/services/step-ca.nix
View file

@ -75,19 +75,18 @@ in
"d /var/lib/acme/acme-challenge 0755 acme nginx" "d /var/lib/acme/acme-challenge 0755 acme nginx"
]; ];
security.acme = { # security.acme = {
certs."sid-internal" = { # certs."sid-internal" = {
# domain = constants.intranet; # domain = constants.services.vaultwarden.fqdn;
domain = constants.services.vaultwarden.fqdn; # # extraDomainNames = [
extraDomainNames = [ # # constants.services.netdata.fqdn
constants.services.netdata.fqdn # # constants.services.vaultwarden.fqdn
# constants.services.vaultwarden.fqdn # # constants.services.webdav.fqdn
constants.services.webdav.fqdn # # ];
]; # server = "https://${constants.ca-fqdn}:${toString cfg.port}/acme/acme/directory";
server = "https://${constants.ca-fqdn}:${toString cfg.port}/acme/acme/directory"; # group = "nginx";
group = "nginx"; # };
}; # };
};
sops = sops =
let let