smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0.bz11086-db-phpver-typo.patch

diff -ruN smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-conf smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-conf
--- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-conf        2020-11-08 21:21:24.000000000 +0100
+++ smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-conf    2020-11-09 13:45:57.301883959 +0100
@@ -13,7 +13,7 @@
 if [[ "$innodb" != "enabled" ]]; then
     /sbin/e-smith/db configuration setprop mysqld InnoDB enabled
     /sbin/e-smith/expand-template /etc/my.cnf
-    sv t /service/mysqld
+    sv t /service/mariadb
     sleep 8
 fi
 
diff -ruN smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud
--- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud      2020-11-08 21:30:19.000000000 +0100
+++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud  2020-11-09 13:41:05.802359210 +0100
@@ -50,7 +50,7 @@
     php_admin_value open_basedir /usr/share/nextcloud:/var/lib/nextcloud:/var/log/nextcloud.log:/var/lib/php/nextcloud:/home/e-smith/files/nextcloud:/dev/urandom:/proc/meminfo
 _EOF
 }
-  if ($fascgi_mod eq 'mod_proxy_fcgi'){
+  if ($fastcgi_mod eq 'mod_proxy_fcgi'){
     $php =<<'_EOF';
      <FilesMatch \.php$>
          SetHandler "proxy:unix:/var/run/php-fpm/php74-nextcloud.sock|fcgi://localhost"
diff -ruN smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud
--- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2020-11-08 21:18:40.000000000 +0100
+++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud     2020-11-09 14:52:59.311554232 +0100
@@ -1,6 +1,6 @@
 {
 
-if ($PHP_VERSION eq '72'){
+if ($PHP_VERSION eq '74'){
   if (($nextcloud{'status'} || 'disabled') eq 'enabled'){
     my $max_upload_size = ($nextcloud{MaxUploadSize} || '4096');
     $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);
1	diff -ruN smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-conf smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-conf
2	--- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-conf 2020-11-08 21:21:24.000000000 +0100
3	+++ smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-conf 2020-11-09 13:45:57.301883959 +0100
4	@@ -13,7 +13,7 @@
5	if [[ "$innodb" != "enabled" ]]; then
6	/sbin/e-smith/db configuration setprop mysqld InnoDB enabled
7	/sbin/e-smith/expand-template /etc/my.cnf
8	- sv t /service/mysqld
9	+ sv t /service/mariadb
10	sleep 8
11	fi
12
13	diff -ruN smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud
14	--- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud 2020-11-08 21:30:19.000000000 +0100
15	+++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud 2020-11-09 13:41:05.802359210 +0100
16	@@ -50,7 +50,7 @@
17	php_admin_value open_basedir /usr/share/nextcloud:/var/lib/nextcloud:/var/log/nextcloud.log:/var/lib/php/nextcloud:/home/e-smith/files/nextcloud:/dev/urandom:/proc/meminfo
18	_EOF
19	}
20	- if ($fascgi_mod eq 'mod_proxy_fcgi'){
21	+ if ($fastcgi_mod eq 'mod_proxy_fcgi'){
22	$php =<<'_EOF';
23	<FilesMatch \.php$>
24	SetHandler "proxy:unix:/var/run/php-fpm/php74-nextcloud.sock\|fcgi://localhost"
25	diff -ruN smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud
26	--- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2020-11-08 21:18:40.000000000 +0100
27	+++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2020-11-09 14:52:59.311554232 +0100
28	@@ -1,6 +1,6 @@
29	{
30
31	-if ($PHP_VERSION eq '72'){
32	+if ($PHP_VERSION eq '74'){
33	if (($nextcloud{'status'} \|\| 'disabled') eq 'enabled'){
34	my $max_upload_size = ($nextcloud{MaxUploadSize} \|\| '4096');
35	$max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);