/[smeserver]/rpms/smeserver-php/sme10/smeserver-php-3.0.0-bz11410-sendmail.patch
ViewVC logotype

Annotation of /rpms/smeserver-php/sme10/smeserver-php-3.0.0-bz11410-sendmail.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Sun Mar 7 04:53:19 2021 UTC (3 years, 8 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-php-3_0_0-44_el7_sme, smeserver-php-3_0_0-47_el7_sme, smeserver-php-3_0_0-31_el7_sme, smeserver-php-3_0_0-28_el7_sme, smeserver-php-3_0_0-45_el7_sme, smeserver-php-3_0_0-48_el7_sme, smeserver-php-3_0_0-43_el7_sme, smeserver-php-3_0_0-46_el7_sme, smeserver-php-3_0_0-41_el7_sme, smeserver-php-3_0_0-30_el7_sme, smeserver-php-3_0_0-29_el7_sme, smeserver-php-3_0_0-42_el7_sme, smeserver-php-3_0_0-34_el7_sme, smeserver-php-3_0_0-37_el7_sme, smeserver-php-3_0_0-40_el7_sme, smeserver-php-3_0_0-35_el7_sme, smeserver-php-3_0_0-26_el7_sme, smeserver-php-3_0_0-32_el7_sme, smeserver-php-3_0_0-38_el7_sme, smeserver-php-3_0_0-27_el7_sme, smeserver-php-3_0_0-39_el7_sme, smeserver-php-3_0_0-36_el7_sme, smeserver-php-3_0_0-33_el7_sme, HEAD 
* Sat Mar 06 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-26.sme
- improve sendmail parameter, force sender  [SME: 11410]
  MailForceSender as property for php versions, ibays and pools
1 jpp 1.1 diff -Nur --no-dereference smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All
2     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All 2021-03-06 23:17:38.962000000 -0500
3     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All 2021-03-06 23:46:29.548000000 -0500
4     @@ -29,6 +29,7 @@
5     my $display_errors = $pool->prop('DisplayErrors') || 'disabled';
6     my $log_errors = $pool->prop('LogErrors') || 'disabled';
7     my $autoprepend = $pool->prop('AutoPrependFile') || 'enabled';
8     + my $MailForceSender = $pool->prop('MailForceSender') || "php\@$DomainName";
9    
10     # Format vars
11     my $autoprep = ( $autoprepend eq "disabled") ? "" : "/usr/share/php/auth_translation.php";
12     @@ -61,7 +62,7 @@
13     php_admin_value[opcache.file_cache] = /var/lib/php/$key/opcache
14     php_admin_value[upload_tmp_dir] = /var/lib/php/$key/tmp
15     php_admin_value[sys_temp_dir] = /var/lib/php/$key/tmp
16     -php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName }
17     +php_admin_value[mail.force_extra_parameters] = '-f $MailForceSender'
18     php_admin_flag[display_errors] = $display_errors
19     php_admin_flag[log_errors] = $log_errors
20     php_admin_value[error_log] = /var/log/php/$key/error.log
21     diff -Nur --no-dereference smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays
22     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays 2021-03-06 23:17:38.962000000 -0500
23     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays 2021-03-06 23:46:50.213000000 -0500
24     @@ -27,7 +27,8 @@
25     'passthru,phpinfo,' .
26     'escapeshellarg,escapeshellcmd';
27     my $autoprepend = $ibay->prop('PHPAutoPrependFile') || 'enabled';
28     -
29     + my $MailForceSender = $ibay->prop('MailForceSender') || "$name\@$DomainName";
30     + # TODO => check ibay associated domains.
31     # Format vars
32     my $autoprep = ( $autoprepend eq "disabled") ? "" : "/usr/share/php/auth_translation.php";
33     my $autoprepath = ( $autoprepend eq "disabled") ? "" : ",/usr/share/php/";
34     @@ -56,7 +57,7 @@
35     php_admin_value[opcache.file_cache] = /var/lib/php/$key/opcache
36     php_admin_value[upload_tmp_dir] = /var/lib/php/$key/tmp
37     php_admin_value[sys_temp_dir] = /var/lib/php/$key/tmp
38     -php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName }
39     +php_admin_value[mail.force_extra_parameters] = '-f $MailForceSender'
40     php_admin_flag[display_errors] = off
41     php_admin_flag[log_errors] = on
42     php_admin_value[error_log] = /var/log/php/$key/error.log
43     diff -Nur --no-dereference smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings
44     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings 2021-03-06 23:17:38.963000000 -0500
45     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings 2021-03-06 23:47:08.862000000 -0500
46     @@ -1,4 +1,4 @@
47     -php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName }
48     +php_admin_value[mail.force_extra_parameters] = '-f { "php\@$DomainName" }'
49     php_admin_flag[display_errors] = off
50     php_admin_flag[log_errors] = on
51     php_admin_value[memory_limit] = { $MemoryLimit }
52     diff -Nur --no-dereference smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings02mailfunction smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings02mailfunction
53     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings02mailfunction 2021-03-06 23:17:38.967000000 -0500
54     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings02mailfunction 2021-03-06 23:46:10.186000000 -0500
55     @@ -1,8 +1,10 @@
56     [mail function]
57     SMTP = localhost
58     smtp_port = {($qpsmtpd{TCPPort} || '25')}
59     -sendmail_from = root@{$DomainName}
60     +; windows setting, but in case :
61     +sendmail_from = '{$phpcur->prop(MailForceSender)|| $php{'MailForceSender'} || "root\@$DomainName" }'
62     sendmail_path = {($phpcur->prop(SendmailPath) || $php{"SendmailPath"} || '/usr/sbin/sendmail -t -i')}
63     +mail.force_extra_parameters = '-f {$phpcur->prop(MailForceSender)|| $php{'MailForceSender'} || "root\@$DomainName" }'
64     mail.log = {
65     my $mailog = $phpcur->prop(MailLog) || $php{"MailLog"} || "disabled";
66     my $mlog = ($mailog eq "enabled")? "/var/log/php/php$PHP_VERSION/mail.log" : "";
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed