adds composer install to http/Makefile

http/Makefile

@@ -72,7 +72,7 @@ endef
 # RULES #
 #########
 
-all: bin/pp prune $(blogs) public out
+all: bin/pp prune $(blogs) public out vendor
 
 bin/pp:
 	cd pp && $(MAKE) && cp pp ../bin/pp
@@ -114,9 +114,13 @@ prune_out:
 
 $(foreach blog,$(blogs),$(eval $(prune_blog_rule)))
 
+vendor: composer.json composer.lock
+	composer install
+
 .PHONY: clean
 clean:
 	rm -rf \
+	vendor \
 	out \
 	$(foreach blog,$(blogs), \
 		$(foreach ext,upphtml upphtml.args,\

http/nginx.conf

@@ -27,7 +27,7 @@ http {
 
         location / {
             root   /usr/share/nginx/html;
-            try_files $uri $uri.html $uri/index.html $uri.php $uri/index.php;
+            try_files $uri $uri.html $uri/index.html $uri.php $uri/index.php =404;
         }
 
         error_page  404              /error.html;
@@ -36,7 +36,7 @@ http {
             root           html;
             fastcgi_pass   unix:/run/php8.5-fpm-joeac.net-http.sock;
             fastcgi_index  index.php;
-            fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+            fastcgi_param  SCRIPT_FILENAME  /usr/share/nginx/html$fastcgi_script_name;
             include        fastcgi_params;
         }
 

http/php-fpm.conf

@@ -6,6 +6,12 @@ listen.owner = nginx
 listen.group = nginx
 listen.mode = 0660
 
+access.log = /var/log/php85/$pool.access.log
+access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%"
+catch_workers_output = yes
+php_admin_value[error_log] = /var/log/php85/$pool.error.log
+php_admin_flag[log_errors] = on
+
 php_admin_value[disable_functions] = exec,passthru,shell_exec,system
 php_admin_flag[allow_url_fopen] = off
 
@@ -15,3 +21,16 @@ pm.start_servers = 4
 pm.min_spare_servers = 2
 pm.max_spare_servers = 8
 pm.max_requests = 500
+
+clear_env = no
+env[MAX_DAILY_EMAILS] = $MAX_DAILY_EMAILS
+env[CONTACT_MAILBOX] = $CONTACT_MAILBOX
+env[CONTACT_MAILBOX_NAME] = $CONTACT_MAILBOX_NAME
+env[LOCAL_SMTP_FROM] = $LOCAL_SMTP_FROM
+env[LOCAL_SMTP_FROM_NAME] = $LOCAL_SMTP_FROM_NAME
+env[LOCAL_SMTP_HOST] = $LOCAL_SMTP_HOST
+env[LOCAL_SMTP_PORT] = $LOCAL_SMTP_PORT
+env[LOCAL_SMTP_USER] = $LOCAL_SMTP_USER
+env[LOCAL_SMTP_PASSWORD] = $LOCAL_SMTP_PASSWORD
+env[DB_SCHEME] = $DB_SCHEME
+env[DB_PATH] = $DB_PATH