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

Merge pull request 'enabled intranet' (#38) from develop into master
All checks were successful
Deploy configs / deploy-configs (push) Successful in 23s
Details

Browse source 
Reviewed-on: #38
This commit is contained in:
sid 2026-05-02 19:57:40 +02:00
commit bf829bcc6e
2 changed files with 44 additions and 36 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,10 +40,14 @@ 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}" = mkVirtualHost { virtualHosts."${constants.services.netdata.fqdn}" = {
# inherit ssl; useACMEHost = "sid-internal";
# port = constants.services.netdata.port; forceSSL = ssl;
# }; 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;
@ -61,20 +65,23 @@ 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}" = mkVirtualHost { virtualHosts."${constants.services.webdav.fqdn}" = {
# inherit ssl; useACMEHost = "sid-internal";
# address = constants.hosts.rx4.ip; forceSSL = ssl;
# port = constants.services.webdav.port; locations."/" = {
# }; 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,18 +75,19 @@ 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.services.vaultwarden.fqdn; # domain = constants.intranet;
# # extraDomainNames = [ domain = constants.services.vaultwarden.fqdn;
# # constants.services.netdata.fqdn extraDomainNames = [
# # constants.services.vaultwarden.fqdn constants.services.netdata.fqdn
# # constants.services.webdav.fqdn # constants.services.vaultwarden.fqdn
# # ]; constants.services.webdav.fqdn
# server = "https://${constants.ca-fqdn}:${toString cfg.port}/acme/acme/directory"; ];
# group = "nginx"; server = "https://${constants.ca-fqdn}:${toString cfg.port}/acme/acme/directory";
# }; group = "nginx";
# }; };
};
sops = sops =
let let