rrvsh/pantheon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(web-servers/nginx): allow wildcard subdomains for letsencrypt certs

Browse source
This commit is contained in:
Mohammad Rafiq 2025-06-13 04:46:11 +08:00
parent d539849088
commit 40f526ce62
No known key found for this signature in database
2 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/nixos/server/web-servers/default.nix
View file

@ -1,6 +1,11 @@
{ config, lib, ... }:
let
inherit (lib) mkMerge mkIf mkEnableOption;
inherit (lib)
mkMerge
mkIf
mkEnableOption
singleton
;
cfg = config.server.web-servers;
in
{
@ -19,6 +24,12 @@ in
dnsProvider = "cloudflare";
credentialFiles."CLOUDFLARE_DNS_API_TOKEN_FILE" = config.sops.secrets."keys/cloudflare".path;
};
certs = {
"rrv.sh".extraDomainNames = singleton "*.rrv.sh";
"bwfiq.com".extraDomainNames = singleton "*.bwfiq.com";
"slayment.com".extraDomainNames = singleton "*.slayment.com";
"aenyrathia.wiki".extraDomainNames = singleton "*.aenyrathia.wiki";
};
};
})
];

21
modules/nixos/server/web-servers/nginx/default.nix
View file

@ -5,15 +5,17 @@ let
mkOption
mkEnableOption
mkIf
singleton
;
inherit (lib.pantheon) mkStrOption;
inherit (lib.types) listOf submodule attrs;
inherit (lib.pantheon) mkStrOption mkRootDomain;
inherit (builtins) listToAttrs map;
cfg = config.server.web-servers.nginx;
sslCheck = if config.server.web-servers.enableSSL then true else false;
sslCheck = good: bad: if config.server.web-servers.enableSSL then good else bad;
defaultSink = mkIf cfg.enableDefaultSink {
"_" = {
default = true;
rejectSSL = sslCheck;
rejectSSL = sslCheck true false;
locations."/" = {
return = "444";
};
@ -23,9 +25,9 @@ let
map (proxy: {
name = proxy.source;
value = {
addSSL = sslCheck;
enableACME = sslCheck;
acmeRoot = null;
addSSL = sslCheck true false;
useACMEHost = sslCheck (mkRootDomain proxy.source) null;
acmeRoot = null; # needed for DNS validation
locations."/" = {
proxyPass = proxy.target;
} // proxy.extraConfig;
@ -43,9 +45,8 @@ in
default = true;
};
proxies = mkOption {
type =
with lib.types;
listOf (submodule {
default = [ ];
type = listOf (submodule {
options = {
source = mkStrOption;
target = mkStrOption;
@ -55,7 +56,6 @@ in
};
};
});
default = [ ];
};
};
@ -64,6 +64,7 @@ in
443
80
];
users.users.nginx.extraGroups = singleton "acme";
services.nginx = {
enable = true;
virtualHosts = mkMerge [