projects
/
pharext
/
replicator.pharext.org
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
9645b1a
)
etc/apache2.conf: macro update
author
Michael Wallner
<root@s201809.m6w6.name>
Mon, 25 Mar 2019 13:06:00 +0000
(14:06 +0100)
committer
Michael Wallner
<root@s201809.m6w6.name>
Mon, 25 Mar 2019 13:06:00 +0000
(14:06 +0100)
etc/apache2.conf
patch
|
blob
|
history
diff --git
a/etc/apache2.conf
b/etc/apache2.conf
index dbb2a406478cf21897ef5a54cce6bc007764a60f..93b722ecd7bf82ad77e559340417f896540ee163 100644
(file)
--- a/
etc/apache2.conf
+++ b/
etc/apache2.conf
@@
-22,17
+22,12
@@
<VirtualHost *:80>
Use replicator_host_defs
<VirtualHost *:80>
Use replicator_host_defs
- Redirect permanent / https://replicator.pharext.org/
+ Use ssl_redirect
+</VirtualHost>
+
+<VirtualHost *:443>
+ Use replicator_host_defs
+ Use ssl_defs "pharext.org" "hsts"
</VirtualHost>
</VirtualHost>
-<IfModule ssl_module>
- <VirtualHost *:443>
- Use replicator_host_defs
- Include "bits/hsts"
- SSLEngine on
- SSLUseStapling on
- SSLCertificateKeyFile /etc/letsencrypt/live/pharext.org/privkey.pem
- SSLCertificateFile /etc/letsencrypt/live/pharext.org/fullchain.pem
- </VirtualHost>
-</IfModule>
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet