Merge branch 'develop' into develop

This commit is contained in:
EDIflyer
2024-06-10 20:10:42 +01:00
committed by GitHub
123 changed files with 4504 additions and 14066 deletions

View File

@ -1,9 +1,12 @@
# Since force-ssl.conf has now moved to the server section it overrides
# the LetsEncrypt config which is inside a location section
# Set FORCE variable in first two if tests pass and action in the third
set $FORCE "";
set $test "";
if ($scheme = "http") {
set $FORCE 'H';
set $test "H";
}
if ($request_uri ~ "^\/\.well-known\/acme-challenge\/(.*)" {
set $test "${test}T";
}
if ($test = H) {
return 301 https://$host$request_uri;
}
if ($request_uri !~ "^\/\.well-known\/acme-challenge\/(.*)") {
set $FORCE "${FORCE}D";