smeserver-roundcube/contribs10/smeserver-roundcube-1.2-Add-update-event-in-createlinks-and-fix-smtp-port-in-config.patch

diff -urN smeserver-roundcube-1.2.old/createlinks smeserver-roundcube-1.2/createlinks
--- smeserver-roundcube-1.2.old/createlinks     2015-04-02 01:05:54.000000000 +0100
+++ smeserver-roundcube-1.2/createlinks 2021-04-04 11:04:56.881582351 +0100
@@ -2,8 +2,33 @@
 
 use esmith::Build::CreateLinks qw(:all);
 
+# Koozali event specific for updating with yum without reboot
+$event = "smeserver-roundcube-update";
+#add here the path to your templates needed to expand
+#see the /etc/systemd/system-preset/49-koozali.preset should be present for systemd integration on all you yum update event
+
+foreach my $file (qw(
+                /etc/systemd/system-preset/49-koozali.preset
+))
+{
+    templates2events( $file, $event );
+}
+
+#action needed in case we have a systemd unit
+event_link("systemd-default", $event, "10");
+event_link("systemd-reload", $event, "50");
+
+#action specific to this package
+#event_link("some event", $event, "30");
+#services we need to restart
+#safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/some service");
+#and Server Manager panel link
+#panel_link('somefunction', 'manager');
+
+
 #expand specific roundcube template
 for my $event (qw(
+    smeserver-roundcube-update
     bootstrap-console-save
     conf-roundcube
     roundcube-update
@@ -18,6 +43,7 @@
 
 #restart specific services to avoid to reboot after the installation
 for  my $event (qw(
+    smeserver-roundcube-update
     conf-roundcube
     roundcube-update
     ))
@@ -33,6 +59,7 @@
 
 #We want to expand /etc/e-smith/templates-user/.qmail
 foreach my $event (qw(
+    smeserver-roundcube-update
     conf-roundcube
     roundcube-update
    ))
diff -urN 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
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube        2015-04-02 01:05:54.000000000 +0100
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube    2021-04-04 11:00:27.916378591 +0100
@@ -76,9 +76,13 @@
           $OUT .= "    require valid-user\n";
           $OUT .= "    Satisfy $satisfy\n";
       }
-      $OUT .= "    AddType application/x-httpd-php .php\n";
-      $OUT .= "    php_admin_value eaccelerator.enable 1\n";
-      $OUT .= "</Directory>\n";
+       $OUT .= "    AddType application/x-httpd-php .php\n";
+       $version = 74;
+       $OUT .= "<FilesMatch \.php\$\>\n";
+       $OUT .= "SetHandler \"proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost\"\n";
+       $OUT .= "</FilesMatch>\n";
+#      $OUT .= "    php_admin_value eaccelerator.enable 1\n";
+       $OUT .= "</Directory>\n";
 
       $OUT .= qq (
 <Directory /usr/share/roundcubemail/installer/>
diff -urN smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/40SMTP smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/40SMTP
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/40SMTP      2015-04-02 01:05:54.000000000 +0100
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/40SMTP  2021-04-04 10:32:17.438168144 +0100
@@ -16,7 +16,7 @@
 
 // SMTP port (default is 25; use 587 for STARTTLS or 465 for the
 // deprecated SSL over SMTP (aka SMTPS))
-    {$OUT .= "\$config['smtp_port'] = $ssmtpd{'TCPPort'};\n";}
+    {$OUT .= "\$config['smtp_port'] = $qpsmtpd{'TCPPort'};\n";}
 
 // SMTP username (if required) if you use %u as the username Roundcube
 // will use the current username for login
1	brianr	1.1	diff -urN smeserver-roundcube-1.2.old/createlinks smeserver-roundcube-1.2/createlinks
2			--- smeserver-roundcube-1.2.old/createlinks 2015-04-02 01:05:54.000000000 +0100
3			+++ smeserver-roundcube-1.2/createlinks 2021-04-04 11:04:56.881582351 +0100
4			@@ -2,8 +2,33 @@
5
6			use esmith::Build::CreateLinks qw(:all);
7
8			+# Koozali event specific for updating with yum without reboot
9			+$event = "smeserver-roundcube-update";
10			+#add here the path to your templates needed to expand
11			+#see the /etc/systemd/system-preset/49-koozali.preset should be present for systemd integration on all you yum update event
12			+
13			+foreach my $file (qw(
14			+ /etc/systemd/system-preset/49-koozali.preset
15			+))
16			+{
17			+ templates2events( $file, $event );
18			+}
19			+
20			+#action needed in case we have a systemd unit
21			+event_link("systemd-default", $event, "10");
22			+event_link("systemd-reload", $event, "50");
23			+
24			+#action specific to this package
25			+#event_link("some event", $event, "30");
26			+#services we need to restart
27			+#safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/some service");
28			+#and Server Manager panel link
29			+#panel_link('somefunction', 'manager');
30			+
31			+
32			#expand specific roundcube template
33			for my $event (qw(
34			+ smeserver-roundcube-update
35			bootstrap-console-save
36			conf-roundcube
37			roundcube-update
38			@@ -18,6 +43,7 @@
39
40			#restart specific services to avoid to reboot after the installation
41			for my $event (qw(
42			+ smeserver-roundcube-update
43			conf-roundcube
44			roundcube-update
45			))
46			@@ -33,6 +59,7 @@
47
48			#We want to expand /etc/e-smith/templates-user/.qmail
49			foreach my $event (qw(
50			+ smeserver-roundcube-update
51			conf-roundcube
52			roundcube-update
53			))
54			diff -urN 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
55			--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube 2015-04-02 01:05:54.000000000 +0100
56			+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube 2021-04-04 11:00:27.916378591 +0100
57			@@ -76,9 +76,13 @@
58			$OUT .= " require valid-user\n";
59			$OUT .= " Satisfy $satisfy\n";
60			}
61			- $OUT .= " AddType application/x-httpd-php .php\n";
62			- $OUT .= " php_admin_value eaccelerator.enable 1\n";
63			- $OUT .= "</Directory>\n";
64			+ $OUT .= " AddType application/x-httpd-php .php\n";
65			+ $version = 74;
66			+ $OUT .= "<FilesMatch \.php\$\>\n";
67			+ $OUT .= "SetHandler \"proxy:unix:/var/run/php-fpm/php$version.sock\|fcgi://localhost\"\n";
68			+ $OUT .= "</FilesMatch>\n";
69			+# $OUT .= " php_admin_value eaccelerator.enable 1\n";
70			+ $OUT .= "</Directory>\n";
71
72			$OUT .= qq (
73			<Directory /usr/share/roundcubemail/installer/>
74			diff -urN smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/40SMTP smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/40SMTP
75			--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/40SMTP 2015-04-02 01:05:54.000000000 +0100
76			+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/40SMTP 2021-04-04 10:32:17.438168144 +0100
77			@@ -16,7 +16,7 @@
78
79			// SMTP port (default is 25; use 587 for STARTTLS or 465 for the
80			// deprecated SSL over SMTP (aka SMTPS))
81			- {$OUT .= "\$config['smtp_port'] = $ssmtpd{'TCPPort'};\n";}
82			+ {$OUT .= "\$config['smtp_port'] = $qpsmtpd{'TCPPort'};\n";}
83
84			// SMTP username (if required) if you use %u as the username Roundcube
85			// will use the current username for login