Various updates
This commit is contained in:
parent
26165af972
commit
375a85e0e7
25 changed files with 291 additions and 167 deletions
|
|
@ -144,21 +144,48 @@ in
|
|||
'') cfg.dynamicdnsDomains
|
||||
);
|
||||
|
||||
extraConfig = lib.concatStringsSep "\n" (
|
||||
map (
|
||||
domainConfig:
|
||||
let
|
||||
certPath = config.security.acme.certs."${domainConfig.domain}".directory;
|
||||
in
|
||||
''
|
||||
(cloudflare_${domainConfig.domain}) {
|
||||
tls ${certPath}/cert.pem ${certPath}/key.pem {
|
||||
protocols tls1.3
|
||||
extraConfig =
|
||||
lib.concatStringsSep "\n" (
|
||||
map (
|
||||
domainConfig:
|
||||
let
|
||||
certPath = config.security.acme.certs."${domainConfig.domain}".directory;
|
||||
in
|
||||
''
|
||||
(cloudflare_${domainConfig.domain}) {
|
||||
tls ${certPath}/cert.pem ${certPath}/key.pem {
|
||||
protocols tls1.3
|
||||
}
|
||||
}
|
||||
''
|
||||
) cfg.domainsList
|
||||
)
|
||||
+ "\n"
|
||||
+ ''
|
||||
(cors) {
|
||||
@cors_preflight{args[0]} method OPTIONS
|
||||
@cors{args[0]} header Origin {args[0]}
|
||||
|
||||
handle @cors_preflight{args[0]} {
|
||||
header {
|
||||
Access-Control-Allow-Origin "{args[0]}"
|
||||
Access-Control-Allow-Methods "GET, POST, PUT, PATCH, DELETE, OPTIONS"
|
||||
Access-Control-Allow-Headers *
|
||||
Access-Control-Max-Age "3600"
|
||||
defer
|
||||
}
|
||||
respond "" 204
|
||||
}
|
||||
|
||||
handle @cors{args[0]} {
|
||||
header {
|
||||
Access-Control-Allow-Origin "{args[0]}"
|
||||
Access-Control-Expose-Headers *
|
||||
defer
|
||||
}
|
||||
}
|
||||
''
|
||||
) cfg.domainsList
|
||||
);
|
||||
}
|
||||
'';
|
||||
|
||||
virtualHosts = lib.foldl' (
|
||||
acc: extraVirtualHost:
|
||||
|
|
@ -167,6 +194,7 @@ in
|
|||
"${extraVirtualHost.subdomain}.${extraVirtualHost.domain}".extraConfig = ''
|
||||
reverse_proxy ${extraVirtualHost.host}
|
||||
import cloudflare_${extraVirtualHost.domain}
|
||||
import cors https://home.pasetto.me
|
||||
'';
|
||||
}
|
||||
) { } cfg.extraVirtualHosts;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue