diff --git a/Makefile b/Makefile index 3c22dc5..5a2f5f2 100644 --- a/Makefile +++ b/Makefile @@ -9,3 +9,5 @@ endef include $(FAB_PATH)/common/mk/turnkey/lamp.mk include $(FAB_PATH)/common/mk/turnkey.mk +include $(FAB_PATH)/common/mk/turnkey/php-fpm.mk + diff --git a/conf.d/main b/conf.d/main index 00f8b5e..96241f7 100755 --- a/conf.d/main +++ b/conf.d/main @@ -10,8 +10,9 @@ ADMIN_USER=admin ADMIN_PASS=turnkey ADMIN_MAIL=admin@example.com + # increase php running limits -PHPINI=/etc/php/7.0/apache2/php.ini +PHPINI=/etc/php/7.0/fpm/php.ini sed -i "s|^memory_limit.*|memory_limit = 128M|" $PHPINI sed -i "s|^upload_max_filesize.*|upload_max_filesize = 16M|" $PHPINI sed -i "s|^post_max_size.*|post_max_size = 48M|" $PHPINI diff --git a/plan/main b/plan/main index ce18ef9..690e567 100644 --- a/plan/main +++ b/plan/main @@ -1,5 +1,6 @@ #include #include +#include libjs-cropper /* wordpress dep */ libjs-jquery /* wordpress dep */