Merge branch 'master' of gitlab.com:thallian/docker-php7-fpm

README.md

@@ -0,0 +1,28 @@
+[php-fpm](https://php-fpm.org/) with php7.
+
+# Environment Variables
+## FPMUSER
+- default: nobody
+
+The user which runs the fpm process.
+
+## FPMGROUP
+- default: nobody
+
+The group which runs the fpm process.
+
+## MAX_UPLOAD_SIZE
+- default: 512M
+
+Maximal upload size.
+
+## PHP_ADMIN_VALUES
+Comma seperated list of php admin values.
+
+Each element is a key-value pair, seperated by an equal sign.
+
+
+## PHP_ADMIN_FLAGS
+Comma seperated list of php admin flags.
+
+Each element is a key-value pair, seperated by an equal sign.

rootfs/etc/confd/templates/www.conf.tmpl

@@ -424,8 +424,8 @@ env[PATH] = /usr/local/bin:/usr/bin:/bin
 php_admin_value[default_charset] = UTF-8
 
 {{if (getenv "MAXUPLOADSIZE")}}
-php_admin_value[upload_max_filesize] = {{getenv "MAXUPLOADSIZE"}}
-php_admin_value[post_max_size] = {{getenv "MAXUPLOADSIZE"}}
+php_admin_value[upload_max_filesize] = {{getenv "MAX_UPLOAD_SIZE" "512M"}}
+php_admin_value[post_max_size] = {{getenv "MAX_UPLOAD_SIZE" "512M"}}
 {{end}}
 
 {{if (getenv "PHP_ADMIN_VALUES")}}