projects
/
m6w6
/
m6w6.name
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
349860f
)
update config
author
Michael Wallner
<root@s201809.m6w6.name>
Sat, 9 Mar 2019 11:18:47 +0000
(12:18 +0100)
committer
Michael Wallner
<root@s201809.m6w6.name>
Sat, 9 Mar 2019 11:18:47 +0000
(12:18 +0100)
etc/apache2.conf
patch
|
blob
|
history
diff --git
a/etc/apache2.conf
b/etc/apache2.conf
index c9cf3f82c936f565224cb4a635a68882397c26ac..ab96afadf3c4adc5fd01d3eb3e1670e723385e74 100644
(file)
--- a/
etc/apache2.conf
+++ b/
etc/apache2.conf
@@
-3,21
+3,37
@@
ServerAlias www.m6w6.name
ServerAdmin webmaster@m6w6.name
ServerAlias www.m6w6.name
ServerAdmin webmaster@m6w6.name
- DocumentRoot /var/www/m6w6
+ DocumentRoot /var/www/m6w6
/public
- <Directory /var/www/m6w6>
- Options Indexes FollowSymLinks MultiViews
+ <Directory /var/www/m6w6/public>
AllowOverride None
Require all granted
</Directory>
</Macro>
AllowOverride None
Require all granted
</Directory>
</Macro>
+<VirtualHost _default_:80>
+ Use m6w6_host_defs
+ <Location "/server-status">
+ Define NO_SSL_REDIRECT
+ </Location>
+ <IfDefine !NO_SSL_REDIRECT>
+ RedirectPermanent / https://m6w6.name/
+ </IfDefine>
+</VirtualHost>
<VirtualHost *:80>
Use m6w6_host_defs
RedirectPermanent / https://m6w6.name/
</VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost *:80>
Use m6w6_host_defs
RedirectPermanent / https://m6w6.name/
</VirtualHost>
<IfModule mod_ssl.c>
+ <VirtualHost _default_:443>
+ Use m6w6_host_defs
+ Include "bits/hsts-nosub"
+ SSLEngine on
+ SSLUseStapling on
+ SSLCertificateFile /etc/letsencrypt/live/m6w6.name/fullchain.pem
+ SSLCertificateKeyFile /etc/letsencrypt/live/m6w6.name/privkey.pem
+ </VirtualHost>
<VirtualHost *:443>
Use m6w6_host_defs
Include "bits/hsts-nosub"
<VirtualHost *:443>
Use m6w6_host_defs
Include "bits/hsts-nosub"