nycki/nycki.net
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix redirects
All checks were successful
/ build (push) Successful in 26s
Details

Browse source
This commit is contained in:
Nycki 2024-12-28 02:31:17 +00:00
parent e35780ea63
commit 2bb4b822ed
1 changed files with 20 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
tools/site.conf
View file

@ -1,43 +1,29 @@
# https://palmure.fr/blog.html#default-https-but-only-for-recent-browsers <VirtualHost *:80>
ServerName nycki.blokus.hatspace.net
#<VirtualHost *:80> # ServerName nycki.net
# <Location />
# Require all denied
# </Location>
#</VirtualHost>
#<VirtualHost *:443>
# SSLEngine on # SSLEngine on
# Include /etc/letsencrypt/options-ssl-apache.conf # Include /etc/letsencrypt/options-ssl-apache.conf
# 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
# <Location />
# Require all denied
# </Location>
#</VirtualHost>
<VirtualHost *:80 *:443>
ServerName nycki.net
SSLEngine on
Include /etc/letsencrypt/options-ssl-apache.conf
SSLCertificateFile /etc/letsencrypt/live/klay.gay/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/klay.gay/privkey.pem
# https://palmure.fr/blog.html#default-https-but-only-for-recent-browsers
#Header always add Strict-Transport-Security: "max-age=31536000; includeSubDomains; preload;" #Header always add Strict-Transport-Security: "max-age=31536000; includeSubDomains; preload;"
<If "%{HTTPS} == 'off'"> #<If "%{HTTPS} == 'off'">
<If "%{HTTP:Upgrade-Insecure-Requests} == 1"> # <If "%{HTTP:Upgrade-Insecure-Requests} == 1">
Header always add Vary: Upgrade-Insecure-Requests # Header always add Vary: Upgrade-Insecure-Requests
Redirect / https://nycki.net # Redirect / https://nycki.net
</If> # </If>
</If> #</If>
DocumentRoot /data/nycki.net/site DocumentRoot /data/nycki.net/site
#DirectoryIndex index.html
ErrorDocument 404 /404.html ErrorDocument 404 /404.html
RewriteEngine on RewriteEngine on
#LogLevel alert rewrite:trace3 LogLevel alert rewrite:trace3
RewriteCond "%{DOCUMENT_ROOT}/%{REQUEST_URI}" -f RewriteCond "%{DOCUMENT_ROOT}/%{REQUEST_URI}" -f [OR]
RewriteRule "(.+)" "/$1" [L] RewriteCond "%{DOCUMENT_ROOT}/%{REQUEST_URI}" -d
RewriteRule "^(.+)" "%{DOCUMENT_ROOT}/$1" [L]
<Directory /> <Directory />
Options FollowSymLinks MultiViews Options FollowSymLinks MultiViews
Require all granted Require all granted
@ -45,36 +31,11 @@
# If file isn't in repo, fall back on public_html # If file isn't in repo, fall back on public_html
Define public_html "/home/nycki/public_html" Define public_html "/home/nycki/public_html"
Alias /p ${public_html} RewriteCond "${public_html}%{REQUEST_URI}" -f [OR]
RewriteCond "${public_html}/%{REQUEST_URI}" -f RewriteCond "${public_html}%{REQUEST_URI}" -d
RewriteRule "(.+)" "/p/$1" [PT,L] RewriteRule "^(.+)" "${public_html}$1" [L]
<Directory ${public_html}> <Directory "${public_html}">
Options FollowSymLinks Options FollowSymLinks
Require all granted Require all granted
</Directory> </Directory>
</VirtualHost> </VirtualHost>
<VirtualHost *:443>
ServerName rss.nycki.net
SSLEngine on
Include /etc/letsencrypt/options-ssl-apache.conf
<Location />
ProxyPass http://localhost:8400/
</Location>
SSLCertificateFile /etc/letsencrypt/live/klay.gay/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/klay.gay/privkey.pem
</VirtualHost>
<VirtualHost *:443>
ServerName git.nycki.net
SSLEngine on
Include /etc/letsencrypt/options-ssl-apache.conf
# https://stackoverflow.com/a/9933890/3821202
AllowEncodedSlashes NoDecode
<Location />
ProxyPass http://localhost:8500/ nocanon
</Location>
SSLCertificateFile /etc/letsencrypt/live/klay.gay/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/klay.gay/privkey.pem
</VirtualHost>