Merge branch 'master' into 'release'

Redesign complete. Merging from master into release.

See merge request jaywll/Jnf.me!1

.gitea/workflows/release.yml

@@ -1,22 +0,0 @@
-name: Deploy to production webserver
-run-name: ${{ gitea.actor }} is deploying to production environment
-on:
-  push:
-      branches: [ release ]
-  workflow_dispatch:
-
-jobs:
-  Deploy-To-Production:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      - name: Deploy via SFTP
-        uses: appleboy/scp-action@master
-        with:
-          host: ${{ secrets.PRODUCTION_SFTP_HOST }}
-          username: ${{ secrets.PRODUCTION_SFTP_USERNAME }}
-          key: ${{ secrets.PRODUCTION_SFTP_PRIVATE_KEY }}
-          source: "www/"
-          target: "~/web/jnf.me/public_html/"
-          strip_components: 1

.gitea/workflows/stage.yml

@@ -1,22 +0,0 @@
-name: Deploy to staging webserver
-run-name: ${{ gitea.actor }} is deploying to staging environment
-on:
-  push:
-      branches: [ staging ]
-  workflow_dispatch:
-
-jobs:
-  Deploy-To-Staging:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      - name: Deploy via SFTP
-        uses: appleboy/scp-action@master
-        with:
-          host: ${{ secrets.STAGING_SFTP_HOST }}
-          username: ${{ secrets.STAGING_SFTP_USERNAME }}
-          key: ${{ secrets.STAGING_SFTP_PRIVATE_KEY }}
-          source: "www/"
-          target: "~/web/jnf.dev.jnf.me/public_html/"
-          strip_components: 1

jnf.me.conf

@@ -0,0 +1,3 @@
+location / {
+        return 301 https://www.jnf.me$request_uri;
+}

jnf.me.sconf

@@ -0,0 +1,25 @@
+if ($host != www.jnf.me) {
+    return 301 https://www.jnf.me$request_uri;
+}
+
+location / {
+    index index.php index.html index.htm;
+    try_files $uri /index.html;
+}
+
+location /lucy {
+    index index.php index.html index.htm;
+    try_files $uri /lucy.html;
+}
+
+location ~ \.php$ {
+    fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    if (!-f $document_root$fastcgi_script_name) {
+        return  404;
+    }
+
+    fastcgi_pass    unix:/run/php/php7.4-fpm-ptools.jaywll.co.sock;
+    fastcgi_index   index.php;
+    include         /etc/nginx/fastcgi_params;
+    include         /home/jason/conf/web/ptools.jaywll.co/nginx.fastcgi_cache.conf*;
+}