From 90d7e6ea302bf6ca7f114eef31ffdbf221550c0a Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Thu, 31 Aug 2023 18:03:53 +0200
Subject: [PATCH] switch back to extra_php

---
 conf/extra_php-fpm.conf |  4 ++++
 conf/php-fpm.conf       | 22 ----------------------
 2 files changed, 4 insertions(+), 22 deletions(-)
 create mode 100644 conf/extra_php-fpm.conf
 delete mode 100644 conf/php-fpm.conf

diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf
new file mode 100644
index 00000000..f7960328
--- /dev/null
+++ b/conf/extra_php-fpm.conf
@@ -0,0 +1,4 @@
+; Additional php.ini defines, specific to this pool of workers.
+
+php_admin_value[upload_max_filesize] = 100M
+php_admin_value[post_max_size] = 100M
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
deleted file mode 100644
index 1a417810..00000000
--- a/conf/php-fpm.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-[__pixelfed__]
-
-user = __USER__
-; Group should not be pixelfed, unless image (folder) access rights are not working
-group = www-data
-
-listen = /var/run/php/php__PHPVERSION__-fpm-__APP__.sock
-listen.owner = www-data
-listen.group = www-data
-
-chdir = __INSTALL_DIR__
-
-pm = ondemand
-pm.max_children = 24
-pm.max_requests = 500
-
-request_terminate_timeout = 1d
-
-pm.process_idle_timeout = 10s
-
-php_admin_value[upload_max_filesize] = 100M
-php_admin_value[post_max_size] = 100M