fix redirects

tools/site.conf

@@ -1,43 +1,29 @@
-# https://palmure.fr/blog.html#default-https-but-only-for-recent-browsers
-
-#<VirtualHost *:80>
-#  <Location />
-#    Require all denied
-#  </Location>
-#</VirtualHost>
-
-#<VirtualHost *:443>
+<VirtualHost *:80>
+  ServerName nycki.blokus.hatspace.net
+#  ServerName nycki.net
 #  SSLEngine on
 #  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
-#  <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;"
-  <If "%{HTTPS} == 'off'">
-    <If "%{HTTP:Upgrade-Insecure-Requests} == 1">
-      Header always add Vary: Upgrade-Insecure-Requests
-      Redirect / https://nycki.net 
-    </If>
-  </If>
+  #<If "%{HTTPS} == 'off'">
+  #  <If "%{HTTP:Upgrade-Insecure-Requests} == 1">
+  #    Header always add Vary: Upgrade-Insecure-Requests
+  #    Redirect / https://nycki.net 
+  #  </If>
+  #</If>
 
   DocumentRoot /data/nycki.net/site
+  #DirectoryIndex index.html
   ErrorDocument 404 /404.html
   RewriteEngine on
-  #LogLevel alert rewrite:trace3
+  LogLevel alert rewrite:trace3
 
-  RewriteCond "%{DOCUMENT_ROOT}/%{REQUEST_URI}" -f
-  RewriteRule "(.+)" "/$1" [L]
+  RewriteCond         "%{DOCUMENT_ROOT}/%{REQUEST_URI}" -f [OR]
+  RewriteCond         "%{DOCUMENT_ROOT}/%{REQUEST_URI}" -d
+  RewriteRule "^(.+)" "%{DOCUMENT_ROOT}/$1" [L]
   <Directory />
     Options FollowSymLinks MultiViews
     Require all granted
@@ -45,36 +31,11 @@
 
   # If file isn't in repo, fall back on 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}>
+  RewriteCond         "${public_html}%{REQUEST_URI}" -f [OR]
+  RewriteCond         "${public_html}%{REQUEST_URI}" -d
+  RewriteRule "^(.+)" "${public_html}$1" [L]
+  <Directory "${public_html}">
     Options FollowSymLinks
     Require all granted
   </Directory>
 </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>