include runner config

.forgejo/workflows/build.yaml

@@ -12,6 +12,5 @@ jobs:
       - run: npm ci
       - run: npm run build
       - run: mkdir -p /data/nycki.net/site
-#      - run: cp tools/site.conf /data/nycki.net/site.conf
-#      - run: cp -r _site/* /home/nycki/nycki.net/patches/* /data/nycki.net/site/
-      - run: cp -r _site/* /data/nycki.net/site/
+      - run: cp tools/site.conf /data/nycki.net/site.conf
+      - run: cp -r _site/* /home/nycki/nycki.net/patches/* /data/nycki.net/site/

tools/site.conf

@@ -20,10 +20,8 @@
   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
 
-  #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 "%{HTTP:Upgrade-Insecure-Requests} == 1">
       Header always add Vary: Upgrade-Insecure-Requests
@@ -31,27 +29,15 @@
     </If>
   </If>
 
-  DocumentRoot /data/nycki.net/site
-  ErrorDocument 404 /404.html
-  RewriteEngine on
-  #LogLevel alert rewrite:trace3
+      DocumentRoot /data/nycki.net/site
+ErrorDocument 404 404.html
 
-  RewriteCond "%{DOCUMENT_ROOT}/%{REQUEST_URI}" -f
-  RewriteRule "(.+)" "/$1" [L]
   <Directory />
     Options FollowSymLinks MultiViews
     Require all granted
   </Directory>
-
-  # 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}>
-    Options FollowSymLinks
-    Require all granted
-  </Directory>
+  SSLCertificateFile /etc/letsencrypt/live/klay.gay/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/klay.gay/privkey.pem
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -61,8 +47,8 @@
   <Location />
     ProxyPass http://localhost:8400/
   </Location>
-  SSLCertificateFile /etc/letsencrypt/live/klay.gay/fullchain.pem
-  SSLCertificateKeyFile /etc/letsencrypt/live/klay.gay/privkey.pem
+    SSLCertificateFile /etc/letsencrypt/live/klay.gay/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/klay.gay/privkey.pem
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -75,6 +61,6 @@
   <Location />
     ProxyPass http://localhost:8500/ nocanon
   </Location>
-  SSLCertificateFile /etc/letsencrypt/live/klay.gay/fullchain.pem
-  SSLCertificateKeyFile /etc/letsencrypt/live/klay.gay/privkey.pem
+    SSLCertificateFile /etc/letsencrypt/live/klay.gay/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/klay.gay/privkey.pem
 </VirtualHost>