Merge branch 'master' into 'release'

Redesign complete. Merging from master into release.

See merge request jaywll/Jnf.me!1

Dockerfile

@@ -1,3 +0,0 @@
-FROM docker.io/nginx:1-alpine
-COPY nginx.conf /etc/nginx/conf.d/default.conf
-COPY ./www /www

captain-definition

@@ -1,4 +0,0 @@
-{
-  "schemaVersion": 2,
-  "dockerfilePath": "./Dockerfile"
-}

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*;
+}

local-test.sh

@@ -1,4 +0,0 @@
-# Script used to spin up a local webserver for development & testing
-
-#!/bin/bash
-podman run -it --rm -p 3000:80 $(podman build -q .)

nginx.conf

@@ -1,14 +0,0 @@
-server {
-        listen          80;
-        root            /www;
-
-        location / {
-                index index.html;
-                try_files $uri /index.html;
-        }
-
-        location /lucy {
-                index index.html;
-                try_files $uri /lucy.html;
-        }
-}