/[smecontribs]/rpms/smeserver-roundcube/contribs10/smeserver-roundcube-1.2-bz12489-bz12263.patch
ViewVC logotype

Diff of /rpms/smeserver-roundcube/contribs10/smeserver-roundcube-1.2-bz12489-bz12263.patch

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

Revision 1.2 by jpp, Sat Feb 24 22:44:49 2024 UTC Revision 1.3 by jpp, Sun Feb 25 20:29:15 2024 UTC
# Line 135  diff -Nur --no-dereference smeserver-rou Line 135  diff -Nur --no-dereference smeserver-rou
135  +/usr/bin/rcplugin_update.sh  +/usr/bin/rcplugin_update.sh
136  diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube  diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube
137  --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube        2024-02-24 09:22:05.466000000 -0500  --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube        2024-02-24 09:22:05.466000000 -0500
138  +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube    2024-02-24 11:53:20.478000000 -0500  +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube    2024-02-25 15:07:52.022000000 -0500
139  @@ -4,49 +4,17 @@  @@ -4,49 +4,17 @@
140               unless $status eq 'enabled';               unless $status eq 'enabled';
141    
# Line 150  diff -Nur --no-dereference smeserver-rou Line 150  diff -Nur --no-dereference smeserver-rou
150       for ('exit-if-none')       for ('exit-if-none')
151       {       {
152  -      if ($roundcube{'PublicAccess'})  -      if ($roundcube{'PublicAccess'})
153  +      if ( (exists($roundcube{'access'})  &&  ($roundcube{'access'} eq 'public') )  +      if ( (exists($roundcube{'access'}))  &&  ($roundcube{'access'} eq 'public') )
154         {         {
155  -          if ($roundcube{'PublicAccess'} eq 'none')  -          if ($roundcube{'PublicAccess'} eq 'none')
156  -          {  -          {
# Line 227  diff -Nur --no-dereference smeserver-rou Line 227  diff -Nur --no-dereference smeserver-rou
227   }   }
228  diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube  diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube
229  --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube   1969-12-31 19:00:00.000000000 -0500  --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube   1969-12-31 19:00:00.000000000 -0500
230  +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube       2024-02-24 16:55:55.607000000 -0500  +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube       2024-02-25 15:15:30.366000000 -0500
231  @@ -0,0 +1,67 @@  @@ -0,0 +1,67 @@
232  +{  +{
233  + my $phpversion="81";  + my $phpversion="81";
# Line 239  diff -Nur --no-dereference smeserver-rou Line 239  diff -Nur --no-dereference smeserver-rou
239  +    my $memory_limit = ($roundcube{MemoryLimit} || '512M');  +    my $memory_limit = ($roundcube{MemoryLimit} || '512M');
240  +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);  +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);
241  +    my $open_basedir= $roundcube{PHPBaseDir} || '';  +    my $open_basedir= $roundcube{PHPBaseDir} || '';
242  +    $open_basedir = "/usr/share/roundcubemail:/var/lib/roundcube:/var/log/roundcube.log:/var/lib/php/roundcube:/home/e-smith/files/roundcube:/dev/urandom:/proc/meminfo:/usr/share/GeoIP/GeoLite2-Country.mmdb:/proc/cpuinfo:$open_basedir";  +    $open_basedir = "/usr/share/roundcubemail:/etc/roundcubemail/:/var/log/roundcubemail:/var/lib/roundcubemail:/var/log/roundcube.log:/var/lib/php/roundcube:/home/e-smith/files/roundcube:/dev/urandom:/proc/meminfo:/usr/share/GeoIP/GeoLite2-Country.mmdb:/proc/cpuinfo:$open_basedir";
243  +    my $id = 'roundcube';  +    my $id = 'roundcube';
244  +    my $max_children = $roundcube{'PHPmaxChildren'} || 20;  +    my $max_children = $roundcube{'PHPmaxChildren'} || 20;
245  +    my $min_spare_servers = $roundcube{'PHPminServers'} || 4;  +    my $min_spare_servers = $roundcube{'PHPminServers'} || 4;

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed