aboutsummaryrefslogtreecommitdiff
path: root/src/property
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-12-22 18:52:02 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-12-22 18:52:02 -0700
commit5f6d809581b65fce36c71aa99aebebbaa5ca4c20 (patch)
tree0a69119fa14cbc63c9e385c8c807ab1784dff995 /src/property
parentd9af8d64f9665823b5af67b47f1ad3e3b608caff (diff)
downloadconsfigurator-5f6d809581b65fce36c71aa99aebebbaa5ca4c20.tar.gz
APACHE:HTTPS-VHOST: put user's config before http->https redirect
This allows selectively overriding that redirect. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property')
-rw-r--r--src/property/apache.lisp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/property/apache.lisp b/src/property/apache.lisp
index 757135e..683f1dd 100644
--- a/src/property/apache.lisp
+++ b/src/property/apache.lisp
@@ -137,9 +137,9 @@ restart Apache."
,@initial
"RewriteEngine On"
"RewriteRule ^/.well-known/acme-challenge.* - [L]"
+ ,@additional-config
;; redirect everything else to https
"RewriteRule (.*) https://%{SERVER_NAME}$1 [R=301,L,NE]"
- ,@additional-config
"</VirtualHost>")))))
(on-change (lets-encrypt:certificate-obtained
,agree-tos ,htdocs ,domain ,@aliases)