diff -Nur --no-dereference 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 2024-01-29 14:29:10.203000000 -0500 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-conf 2024-01-29 15:04:46.803000000 -0500 @@ -11,9 +11,9 @@ dbuser=`/sbin/e-smith/db configuration getprop nextcloud DbUser || echo "nextcloud"` adminuser=`/sbin/e-smith/db configuration getprop nextcloud AdminUser || echo "admin"` adminpass=`/sbin/e-smith/db configuration getprop nextcloud AdminPassword ||/sbin/e-smith/db configuration getprop sysconfig SystemID || echo "password;109"` -#occ config:system:get dbhost -host="localhost" -socket="--socket=/var/lib/mysql/mysql.sock" + +host="localhost:/var/lib/mysql/mariadb105.sock" +socket="--socket=/var/lib/mysql/mariadb105.sock" # need to check what db we are supposed to use. starting NC 21 mariadb >= 102 is needed core is 55 # are we fresh install or update ? installed=$(/usr/bin/occ status --output json |jq -r '.installed') @@ -29,45 +29,48 @@ /usr/bin/mysql --defaults-file=/root/.my.cnf $socket -e "grant all on $dbname.* to '$dbuser'@'localhost' identified by '$password';" /usr/bin/mysql --defaults-file=/root/.my.cnf $socket -e "FLUSH PRIVILEGES" -# check if we are migrating from release 10 to 11 -if [ -f /var/www/html/nextcloud/config/config.php ]; then - mv /var/www/html/nextcloud/config/config.php /usr/share/nextcloud/config/config.php - rm -rf /var/www/html/nextcloud/ -fi - res=`/usr/bin/mysql --defaults-file=/root/.my.cnf $socket -e "select count(*) from information_schema.tables where table_type = 'BASE TABLE' and table_schema = '$dbname'" | tail -n1`; if [[ $res == '0' ]]; then /usr/bin/occ maintenance:install --database mysql --database-host $host --database-name $dbname --database-user $dbuser --database-pass $password --admin-user $adminuser --admin-pass $adminpass --data-dir /home/e-smith/files/nextcloud/data/ /usr/bin/occ app:enable user_ldap - /usr/bin/occ ldap:create-empty-config # create config with empty id - /usr/bin/occ ldap:create-empty-config # create config with id s01 - /usr/bin/occ ldap:delete-config '' # delete config with empty id + # might create s01 or empty id depending on version + /usr/bin/occ ldap:create-empty-config + # create config with id s01 if not already present + /usr/bin/occ ldap:show-config s01 1>/dev/null || /usr/bin/occ ldap:create-empty-config + # delete config with empty id if exist + /usr/bin/occ ldap:delete-config '' 1>/dev/null mkdir -p /home/e-smith/files/nextcloud/skeleton/ibays - /usr/bin/occ config:system:set skeletondirectory --value="/home/e-smith/files/nextcloud/skeleton" - #/usr/bin/occ config:system:set templatedirectory --value="" -else - mkdir -p /home/e-smith/files/nextcloud/skeleton/ibays - /usr/bin/occ config:system:set skeletondirectory --value="/home/e-smith/files/nextcloud/skeleton" - # to satisfy code integrity check - if [ -f /usr/share/nextcloud/.htaccess.rpmsave ]; then - rm -f /usr/share/nextcloud/.htaccess.rpmsave - fi - if [ -f /usr/share/nextcloud/.htaccess.rpmnew ]; then - rm -f /usr/share/nextcloud/.htaccess.rpmnew - fi - /usr/bin/occ upgrade - /usr/bin/occ maintenance:mode --off - /usr/bin/occ integrity:check-core - # Catch 'Nextcloud is already latest version' message - if [ $? -eq 3 ]; then - exit 0 - fi fi +mkdir -p /home/e-smith/files/nextcloud/skeleton/ibays +/usr/bin/occ config:system:set skeletondirectory --value="/home/e-smith/files/nextcloud/skeleton" +#/usr/bin/occ config:system:set templatedirectory --value="" + +# to satisfy code integrity check +if [ -f /usr/share/nextcloud/.htaccess.rpmsave ]; then + rm -f /usr/share/nextcloud/.htaccess.rpmsave +fi +if [ -f /usr/share/nextcloud/.htaccess.rpmnew ]; then + rm -f /usr/share/nextcloud/.htaccess.rpmnew +fi + +# upgrade and check integrity +/usr/bin/occ upgrade +/usr/bin/occ maintenance:mode --off +/usr/bin/occ integrity:check-core +## Catch 'Nextcloud is already latest version' message +#if [ $? -eq 3 ]; then +# exit 0 +#fi + +# remove signup link /usr/bin/occ config:system:set --type=bool --value=false simpleSignUpLink.shown +#set default loglevel SME 12412 +/usr/bin/occ config:system:set loglevel --value=3 + #Redis index File Cache /usr/bin/occ config:system:set redis host --value="localhost" /usr/bin/occ config:system:set redis port --value="6379" diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/crontab/98nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/crontab/98nextcloud --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/crontab/98nextcloud 2024-01-29 14:29:10.184000000 -0500 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/crontab/98nextcloud 2024-01-29 15:09:42.494000000 -0500 @@ -1,13 +1,13 @@ # nextcloud cron */15 * * * * www { - $OUT="/usr/bin/php74"; - $version="24"; + $OUT="/usr/bin/php81"; + $version="26"; $search=qr/\s*'version'\s*=>\s*'([0-9]{2})\.[0-9]{1,2}.*/; if ( open NC, "; close NC; } - $OUT="/usr/bin/php81" if $version >= 25; + $OUT="/usr/bin/php74" if $version <= 24; } --define apc.enable_cli=1 --define memory_limit={ $memory=$nextcloud{'memory_limit'}||'1024M';} -f /usr/share/nextcloud/cron.php > /dev/null 2>&1 # nextcloud db update diff -Nur --no-dereference 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 2024-01-29 14:29:10.185000000 -0500 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud 2024-01-29 15:08:20.056000000 -0500 @@ -46,14 +46,14 @@ _EOF } if ($fastcgi_mod eq 'mod_proxy_fcgi'){ - my $phpversion="74"; - my $version="24"; + my $phpversion="81"; + my $version="26"; my $search=qr/\s*'version'\s*=>\s*'([0-9]{2})\.[0-9]{1,2}.*/; if ( open NC, "; close NC; } - $phpversion="81" if $version >= 25; + $phpversion="74" if $version <= 24; $php =<<"_EOF"; diff -Nur --no-dereference 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 2024-01-29 14:29:10.197000000 -0500 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2024-01-29 15:09:06.970000000 -0500 @@ -1,12 +1,12 @@ { - my $phpversion="74"; - my $version="24"; + my $phpversion="81"; + my $version="26"; my $search=qr/\s*'version'\s*=>\s*'([0-9]{2})\.[0-9]{1,2}.*/; if ( open NC, "; close NC; } - $phpversion="81" if $version >= 25; + $phpversion="74" if $version <= 24; if ($PHP_VERSION eq $phpversion){ if (($nextcloud{'status'} || 'disabled') eq 'enabled'){ diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/usr/bin/occ smeserver-nextcloud-1.2.0/root/usr/bin/occ --- smeserver-nextcloud-1.2.0.old/root/usr/bin/occ 2024-01-29 14:29:10.187000000 -0500 +++ smeserver-nextcloud-1.2.0/root/usr/bin/occ 2024-01-29 15:05:48.699000000 -0500 @@ -1,8 +1,8 @@ #!/bin/bash majversion=$(/usr/bin/grep -Eo "'version'.*[0-9]{2}\." /usr/share/nextcloud/config/config.php |/usr/bin/grep -Eo "[0-9]{2}"|head -1) memory=$(config getprop nextcloud memory_limit|| echo "1024M") -myphp=/usr/bin/php74 -if [[ $majversion -ge '25' ]]; then - myphp=/usr/bin/php81 +myphp=/usr/bin/php81 +if [[ $majversion -le '24' ]]; then + myphp=/usr/bin/php74 fi /usr/sbin/runuser -u www -- $myphp -d memory_limit=$memory -d apc.enable_cli=1 /usr/share/nextcloud/occ "$@"