diff --git a/bin/vhost-add.sh b/bin/vhost-add.sh index 1c7304b..9e2cbcb 100755 --- a/bin/vhost-add.sh +++ b/bin/vhost-add.sh @@ -69,12 +69,13 @@ if [[ -d /usr/jails/$username ]]; then fi # set sendmail_path in php-fpm, but only if not already set -vhost::set-phpVersion -if [[ -f /etc/php/$phpVersion/fpm/pool.d/$username.conf ]]; then - if ! /bin/grep -q "^php_admin_value\[sendmail_path\]" /etc/php/$phpVersion/fpm/pool.d/$username.conf; then - echo "php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -fwebmaster@$domain" >> /etc/php/$phpVersion/fpm/pool.d/$username.conf - fi -fi +## disabled, now relying on defaults (user@fqdn) with .forward (/home/user/.forward) +## vhost::set-phpVersion +## if [[ -f /etc/php/$phpVersion/fpm/pool.d/$username.conf ]]; then +## if ! /bin/grep -q "^php_admin_value\[sendmail_path\]" /etc/php/$phpVersion/fpm/pool.d/$username.conf; then +## echo "php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -fwebmaster@$domain" >> /etc/php/$phpVersion/fpm/pool.d/$username.conf +## fi +## fi # create & enable apache config /usr/local/bin/vhost-enable.sh -d $domain -m VHostHTTP