/[smecontribs]/rpms/smeserver-phplist/contribs10/smeserver-phplist-0.2.1-sme10.patch
ViewVC logotype

Diff of /rpms/smeserver-phplist/contribs10/smeserver-phplist-0.2.1-sme10.patch

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

Revision 1.2 by jpp, Tue Aug 2 19:54:45 2022 UTC Revision 1.3 by jpp, Wed Aug 3 02:04:29 2022 UTC
# Line 1  Line 1 
1  diff -Nur --no-dereference smeserver-phplist-0.2.1.old/createlinks smeserver-phplist-0.2.1/createlinks  diff -Nur --no-dereference smeserver-phplist-0.2.1.old/createlinks smeserver-phplist-0.2.1/createlinks
2  --- smeserver-phplist-0.2.1.old/createlinks     2020-03-18 13:12:54.000000000 -0400  --- smeserver-phplist-0.2.1.old/createlinks     2020-03-18 13:12:54.000000000 -0400
3  +++ smeserver-phplist-0.2.1/createlinks 2022-08-02 15:51:25.684000000 -0400  +++ smeserver-phplist-0.2.1/createlinks 2022-08-02 22:02:43.291000000 -0400
4  @@ -15,13 +15,34 @@  @@ -6,7 +6,7 @@
5     templates2events("/etc/phplist/config.php", qw/webapps-update bootstrap-console-save/);
6    
7     safe_symlink("/var/qmail/bin/qmail-newu", "root/etc/e-smith/events/webapps-update/S55phplist-qmail-assign");
8    -foreach my $event (qw/webapps-update ipasserelle-update bootstrap-ldap-save/){
9    +foreach my $event (qw/webapps-update bootstrap-ldap-save/){
10       event_link("phplist-create-pseudo", "$event", "55");
11     }
12    
13    @@ -15,13 +15,36 @@
14    
15   safe_symlink("/var/qmail/alias/.qmail-phplistbounces", "root/var/qmail/alias/.qmail-phplistbounces-default");   safe_symlink("/var/qmail/alias/.qmail-phplistbounces", "root/var/qmail/alias/.qmail-phplistbounces-default");
16    
# Line 16  diff -Nur --no-dereference smeserver-php Line 25  diff -Nur --no-dereference smeserver-php
25    
26   safe_touch("root/var/lib/phplist/bounces.mbox");   safe_touch("root/var/lib/phplist/bounces.mbox");
27  +  +
28  +my $event="smeserver-phplist-udpdate";  +my $event="smeserver-phplist-update";
29  +event_templates($event, qw(  +event_templates($event, qw(
30  +/etc/httpd/conf/httpd.conf  +/etc/httpd/conf/httpd.conf
31  +/etc/opt/remi/php80/php-fpm.d/www.conf  +/etc/opt/remi/php80/php-fpm.d/www.conf
32  +/etc/e-smith/sql/init/phplistdb  +/etc/e-smith/sql/init/phplistdb
33  +/etc/phplist/config.php  +/etc/phplist/config.php
34  +  +/etc/e-smith/sql/init/phplistdb
35  +));  +));
36  +  +
37  +event_services($event, qw(  +event_services($event, qw(
38  +    php80-php-fpm restart  +    php80-php-fpm restart
39  +    httpd-e-smith restart  +    httpd-e-smith restart
40  +    phplist restart  +    phplist restart
41    +    mysql.init restart
42  +));  +));
43    +safe_symlink("/var/qmail/bin/qmail-newu", "root/etc/e-smith/events/$event/S55phplist-qmail-assign");
44  +  +
45  +event_actions($event, qw(  +event_actions($event, qw(
46  +   phplist-create-pseudo 55  +   phplist-create-pseudo 55  
47  +   systemd-default 88  +   systemd-default 88
48  +   systemd-reload  89  +   systemd-reload  89
49  +));  +));
# Line 44  diff -Nur --no-dereference smeserver-php Line 55  diff -Nur --no-dereference smeserver-php
55  +));  +));
56  diff -Nur --no-dereference smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist  diff -Nur --no-dereference smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist
57  --- smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist  2020-03-18 13:12:54.000000000 -0400  --- smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist  2020-03-18 13:12:54.000000000 -0400
58  +++ smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist      2022-08-02 15:53:59.215000000 -0400  +++ smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist      2022-08-02 22:03:20.751000000 -0400
59  @@ -6,7 +6,7 @@  @@ -6,11 +6,12 @@
60   my $alias  =  $phplist{'AliasOnPrimary'} || 'enabled';   my $alias  =  $phplist{'AliasOnPrimary'} || 'enabled';
61   my $ver    = $sysconfig{'ReleaseVersion'} || '8.1';   my $ver    = $sysconfig{'ReleaseVersion'} || '8.1';
62    
# Line 54  diff -Nur --no-dereference smeserver-php Line 65  diff -Nur --no-dereference smeserver-php
65   $alias = ($alias ne 'enabled') ? '' : 'Alias /lists /usr/share/phplist/www/';   $alias = ($alias ne 'enabled') ? '' : 'Alias /lists /usr/share/phplist/www/';
66   $auth = ( $auth eq 'http' ) ? 'AuthName "phplist"' . "\n" .   $auth = ( $auth eq 'http' ) ? 'AuthName "phplist"' . "\n" .
67                                 "    AuthType Basic\n" .                                 "    AuthType Basic\n" .
68  @@ -22,42 +22,30 @@  -                              "    AuthExternal pwauth\n" . (($ver =~ m/^9/) ? "    AuthBasicProvider external\n":'') .
69    +                              "    AuthBasicProvider external\n" .
70    +                              "    AuthExternal pwauth\n" .
71                                   "    require valid-user\n" : '';
72    
73     if ($status eq 'enabled') {
74    @@ -22,42 +23,30 @@
75       Options None +FollowSymLinks       Options None +FollowSymLinks
76       AllowOverride None       AllowOverride None
77       DirectoryIndex index.php       DirectoryIndex index.php
# Line 110  diff -Nur --no-dereference smeserver-php Line 127  diff -Nur --no-dereference smeserver-php
127    
128  diff -Nur --no-dereference smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phplist smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phplist  diff -Nur --no-dereference smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phplist smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phplist
129  --- smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phplist     1969-12-31 19:00:00.000000000 -0500  --- smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phplist     1969-12-31 19:00:00.000000000 -0500
130  +++ smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phplist 2022-08-02 15:49:11.805000000 -0400  +++ smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phplist 2022-08-02 21:50:33.405000000 -0400
131  @@ -0,0 +1,65 @@  @@ -0,0 +1,65 @@
132  +{  +{
133  +  +
# Line 122  diff -Nur --no-dereference smeserver-php Line 139  diff -Nur --no-dereference smeserver-php
139  +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);  +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);
140  +    my $open_basedir= $phplist{PHPBaseDir} || '';  +    my $open_basedir= $phplist{PHPBaseDir} || '';
141  +    $open_basedir = "/usr/share/phplist:/var/lib/phplist:/tmp:/etc/phplist:$open_basedir";  +    $open_basedir = "/usr/share/phplist:/var/lib/phplist:/tmp:/etc/phplist:$open_basedir";
142  +    my $id = 'cacti';  +    my $id = 'phplist';
143  +    my $max_children = $phplist{'PHPmaxChildren'} || 20;  +    my $max_children = $phplist{'PHPmaxChildren'} || 20;
144  +    my $min_spare_servers = $phplist{'PHPminServers'} || 4;  +    my $min_spare_servers = $phplist{'PHPminServers'} || 4;
145  +    my $start_servers = $phplist{'PHPstartServers'} || 6;  +    my $start_servers = $phplist{'PHPstartServers'} || 6;

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