Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mod_php > php-fpm #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

3 changes: 2 additions & 1 deletion conf.d/main
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ ADMIN_USER=admin
ADMIN_PASS=turnkey
[email protected]


# 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
Expand Down
1 change: 1 addition & 0 deletions plan/main
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <turnkey/base>
#include <turnkey/lamp>
#include <turnkey/php-fpm>

libjs-cropper /* wordpress dep */
libjs-jquery /* wordpress dep */
Expand Down