--- rpms/smeserver-phplist/contribs10/smeserver-phplist-0.2.1-sme10.patch	2022/08/02 19:54:45	1.2
+++ rpms/smeserver-phplist/contribs10/smeserver-phplist-0.2.1-sme10.patch	2022/08/03 02:04:29	1.3
@@ -1,7 +1,16 @@
 diff -Nur --no-dereference smeserver-phplist-0.2.1.old/createlinks smeserver-phplist-0.2.1/createlinks
 --- smeserver-phplist-0.2.1.old/createlinks	2020-03-18 13:12:54.000000000 -0400
-+++ smeserver-phplist-0.2.1/createlinks	2022-08-02 15:51:25.684000000 -0400
-@@ -15,13 +15,34 @@
++++ smeserver-phplist-0.2.1/createlinks	2022-08-02 22:02:43.291000000 -0400
+@@ -6,7 +6,7 @@
+ templates2events("/etc/phplist/config.php", qw/webapps-update bootstrap-console-save/);
+ 
+ safe_symlink("/var/qmail/bin/qmail-newu", "root/etc/e-smith/events/webapps-update/S55phplist-qmail-assign");
+-foreach my $event (qw/webapps-update ipasserelle-update bootstrap-ldap-save/){
++foreach my $event (qw/webapps-update bootstrap-ldap-save/){
+   event_link("phplist-create-pseudo", "$event", "55");
+ }
+ 
+@@ -15,13 +15,36 @@
  
  safe_symlink("/var/qmail/alias/.qmail-phplistbounces", "root/var/qmail/alias/.qmail-phplistbounces-default");
  
@@ -16,23 +25,25 @@ diff -Nur --no-dereference smeserver-php
  
  safe_touch("root/var/lib/phplist/bounces.mbox");
 +
-+my $event="smeserver-phplist-udpdate";
++my $event="smeserver-phplist-update";
 +event_templates($event, qw(
 +/etc/httpd/conf/httpd.conf
 +/etc/opt/remi/php80/php-fpm.d/www.conf
 +/etc/e-smith/sql/init/phplistdb
 +/etc/phplist/config.php
-+
++/etc/e-smith/sql/init/phplistdb
 +));
 +
 +event_services($event, qw(
 +    php80-php-fpm restart
 +    httpd-e-smith restart
 +    phplist restart
++    mysql.init restart
 +));
++safe_symlink("/var/qmail/bin/qmail-newu", "root/etc/e-smith/events/$event/S55phplist-qmail-assign");
 +
 +event_actions($event, qw(
-+   phplist-create-pseudo 55
++   phplist-create-pseudo 55   
 +   systemd-default 88
 +   systemd-reload  89
 +));
@@ -44,8 +55,8 @@ diff -Nur --no-dereference smeserver-php
 +));
 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
 --- 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/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist	2022-08-02 15:53:59.215000000 -0400
-@@ -6,7 +6,7 @@
++++ smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist	2022-08-02 22:03:20.751000000 -0400
+@@ -6,11 +6,12 @@
  my $alias  =  $phplist{'AliasOnPrimary'} || 'enabled';
  my $ver    = $sysconfig{'ReleaseVersion'} || '8.1';
  
@@ -54,7 +65,13 @@ diff -Nur --no-dereference smeserver-php
  $alias = ($alias ne 'enabled') ? '' : 'Alias /lists /usr/share/phplist/www/';
  $auth = ( $auth eq 'http' ) ? 'AuthName "phplist"' . "\n" .
                                "    AuthType Basic\n" .
-@@ -22,42 +22,30 @@
+-                              "    AuthExternal pwauth\n" . (($ver =~ m/^9/) ? "    AuthBasicProvider external\n":'') .
++                              "    AuthBasicProvider external\n" .
++                              "    AuthExternal pwauth\n" . 
+                               "    require valid-user\n" : '';
+ 
+ if ($status eq 'enabled') {
+@@ -22,42 +23,30 @@
      Options None +FollowSymLinks
      AllowOverride None
      DirectoryIndex index.php
@@ -110,7 +127,7 @@ diff -Nur --no-dereference smeserver-php
  
 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
 --- 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/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
 @@ -0,0 +1,65 @@
 +{
 +
@@ -122,7 +139,7 @@ diff -Nur --no-dereference smeserver-php
 +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);
 +    my $open_basedir= $phplist{PHPBaseDir} || '';
 +    $open_basedir = "/usr/share/phplist:/var/lib/phplist:/tmp:/etc/phplist:$open_basedir";
-+    my $id = 'cacti';
++    my $id = 'phplist';
 +    my $max_children = $phplist{'PHPmaxChildren'} || 20;
 +    my $min_spare_servers = $phplist{'PHPminServers'} || 4;
 +    my $start_servers = $phplist{'PHPstartServers'} || 6;