Browse Source

set global sendmail_path in php-fpm pool configs

Robert Zollner 6 years ago
parent
commit
515286024c

+ 2 - 0
install/deb/php-fpm/dummy.conf

@@ -1,3 +1,5 @@
+; origin-src: deb/php-fpm/dummy.conf
+
 [www]
 listen = 127.0.0.1:9999
 listen.allowed_clients = 127.0.0.1

+ 3 - 2
install/deb/php-fpm/multiphp.tpl

@@ -1,5 +1,6 @@
-[%domain%]
+; origin-src: deb/php-fpm/multiphp.tpl
 
+[%domain%]
 listen = /run/php/php%backend_version%-fpm-%domain%.sock
 listen.owner = %user%
 listen.group = www-data
@@ -17,7 +18,7 @@ pm.status_path = /status
 php_admin_value[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
 php_admin_value[open_basedir] = /home/%user%/web/%domain%/public_html:/home/%user%/web/%domain%/public_shtml:/home/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail
-php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@%domain%\"
+php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f admin@%domain%\"
 
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 env[TMP] = /home/%user%/tmp

+ 2 - 0
install/deb/php-fpm/www.conf

@@ -1,3 +1,5 @@
+; origin-src: deb/php-fpm/www.conf
+
 [www]
 listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1

+ 4 - 1
install/deb/templates/web/php-fpm/default.tpl

@@ -1,5 +1,6 @@
-[%backend%]
+; origin-src: deb/templates/web/php-fpm/default.tpl
 
+[%backend%]
 listen = /run/php/php%backend_version%-fpm-%domain%.sock
 listen.owner = %user%
 listen.group = www-data
@@ -16,6 +17,8 @@ pm.status_path = /status
 
 php_admin_value[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
+php_admin_value[open_basedir] = /home/%user%/web/%domain%/public_html:/home/%user%/web/%domain%/public_shtml:/home/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail
+php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f admin@%domain%\"
 
 env[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin

+ 7 - 4
install/deb/templates/web/php-fpm/socket.tpl

@@ -1,13 +1,14 @@
+; origin-src: deb/templates/web/php-fpm/socket.tpl
+
 [%backend%]
 listen = /var/run/php/%backend%.sock
-listen.allowed_clients = 127.0.0.1
+listen.owner = %user%
+listen.group = www-data
+listen.mode = 0660
 
 user = %user%
 group = %user%
 
-listen.owner = %user%
-listen.group = www-data
-
 pm = ondemand
 pm.max_children = 8
 pm.max_requests = 4000
@@ -16,6 +17,8 @@ pm.status_path = /status
 
 php_admin_value[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
+php_admin_value[open_basedir] = /home/%user%/web/%domain%/public_html:/home/%user%/web/%domain%/public_shtml:/home/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail
+php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f admin@%domain%\"
 
 env[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin