diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 2a16214..9ab7964 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -12,5 +12,5 @@ jobs: - run: npm ci - run: npm run build - run: mkdir -p /data/nycki.net/site - - run: cp site.conf /data/nycki.net/site.conf + - run: cp tools/site.conf /data/nycki.net/site.conf - run: cp -r _site/* /home/nycki/nycki.net/patches/* /data/nycki.net/site/ diff --git a/site.conf b/tools/site.conf similarity index 82% rename from site.conf rename to tools/site.conf index a519445..1ad2c4a 100644 --- a/site.conf +++ b/tools/site.conf @@ -20,8 +20,10 @@ 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;" Header always add Vary: Upgrade-Insecure-Requests @@ -29,15 +31,18 @@ - DocumentRoot /data/nycki.net/site -ErrorDocument 404 404.html - + DocumentRoot /data/nycki.net/site + ErrorDocument 404 404.html Options FollowSymLinks MultiViews Require all granted - SSLCertificateFile /etc/letsencrypt/live/klay.gay/fullchain.pem -SSLCertificateKeyFile /etc/letsencrypt/live/klay.gay/privkey.pem + + Alias /p /home/nycki/public_html +