use public_html fallback
This commit is contained in:
parent
6940dce6e7
commit
80a6b8f15b
1 changed files with 16 additions and 7 deletions
|
@ -32,14 +32,23 @@
|
||||||
</If>
|
</If>
|
||||||
|
|
||||||
DocumentRoot /data/nycki.net/site
|
DocumentRoot /data/nycki.net/site
|
||||||
ErrorDocument 404 404.html
|
ErrorDocument 404 /404.html
|
||||||
|
RewriteEngine on
|
||||||
|
#LogLevel alert rewrite:trace3
|
||||||
|
|
||||||
|
RewriteCond "%{DOCUMENT_ROOT}/%{REQUEST_URI}" -f
|
||||||
|
RewriteRule "(.+)" "/$1" [L]
|
||||||
<Directory />
|
<Directory />
|
||||||
Options FollowSymLinks MultiViews
|
Options FollowSymLinks MultiViews
|
||||||
Require all granted
|
Require all granted
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
Alias /p /home/nycki/public_html
|
# If file isn't in repo, fall back on public_html
|
||||||
<Directory /home/nycki/public_html
|
Define public_html "/home/nycki/public_html"
|
||||||
|
Alias /p ${public_html}
|
||||||
|
RewriteCond "${public_html}/%{REQUEST_URI}" -f
|
||||||
|
RewriteRule "(.+)" "/p/$1" [PT,L]
|
||||||
|
<Directory ${public_html}>
|
||||||
Options FollowSymLinks
|
Options FollowSymLinks
|
||||||
Require all granted
|
Require all granted
|
||||||
</Directory>
|
</Directory>
|
||||||
|
@ -52,8 +61,8 @@
|
||||||
<Location />
|
<Location />
|
||||||
ProxyPass http://localhost:8400/
|
ProxyPass http://localhost:8400/
|
||||||
</Location>
|
</Location>
|
||||||
SSLCertificateFile /etc/letsencrypt/live/klay.gay/fullchain.pem
|
SSLCertificateFile /etc/letsencrypt/live/klay.gay/fullchain.pem
|
||||||
SSLCertificateKeyFile /etc/letsencrypt/live/klay.gay/privkey.pem
|
SSLCertificateKeyFile /etc/letsencrypt/live/klay.gay/privkey.pem
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
<VirtualHost *:443>
|
<VirtualHost *:443>
|
||||||
|
@ -66,6 +75,6 @@ SSLCertificateKeyFile /etc/letsencrypt/live/klay.gay/privkey.pem
|
||||||
<Location />
|
<Location />
|
||||||
ProxyPass http://localhost:8500/ nocanon
|
ProxyPass http://localhost:8500/ nocanon
|
||||||
</Location>
|
</Location>
|
||||||
SSLCertificateFile /etc/letsencrypt/live/klay.gay/fullchain.pem
|
SSLCertificateFile /etc/letsencrypt/live/klay.gay/fullchain.pem
|
||||||
SSLCertificateKeyFile /etc/letsencrypt/live/klay.gay/privkey.pem
|
SSLCertificateKeyFile /etc/letsencrypt/live/klay.gay/privkey.pem
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
Loading…
Reference in a new issue