Merge branch 'master' into desec-apps

Author: enoch85

apps/adminer.sh

@@ -129,6 +129,11 @@ then
 The script will exit."
     exit 1
 else
+    # Allow local access:
+    
+    check_command sed -i "s|local   all             postgres                                peer|local   all             postgres                                md5|g" /etc/postgresql/*/main/pg_hba.conf
+    restart_webserver
+
     msg_box "Adminer was successfully installed and can be reached here:
 https://$ADDRESS:9443
 
@@ -146,5 +151,3 @@ $(grep dbname $NCPATH/config/config.php)
 In case you try to access Adminer and get 'Forbidden' you need to change the IP in:
 $ADMINER_CONF"
 fi
-
-exit

apps/face-recognition.sh

@@ -100,24 +100,24 @@ then
 fi
 
 # Install requirements
-if [[ "$PHPVER" = "8.1" ]]
+if version 20.04 "$DISTRO" 20.04.10
 then
     # https://github.com/matiasdelellis/facerecognition/wiki/PDlib-Installation#ubuntu-focal
     add_trusted_key_and_repo "repo.gpg.key" \
     "https://repo.delellis.com.ar" \
     "https://repo.delellis.com.ar" \
     "focal focal" \
     "facerecognition-pdlib.list"
-    install_if_not php7.4-pdlib
-elif [[ "$PHPVER" = "8.1" ]]
+    install_if_not php"$PHPVER"-pdlib
+elif version 22.04 "$DISTRO" 22.04.10
 then
     # https://github.com/matiasdelellis/facerecognition/wiki/PDlib-Installation#ubuntu-jammy
     add_trusted_key_and_repo "repo.gpg.key" \
     "https://repo.delellis.com.ar" \
     "https://repo.delellis.com.ar" \
     "$CODENAME $CODENAME" \
     "facerecognition-pdlib.list"
-    install_if_not php8.1-pdlib
+    install_if_not php"$PHPVER"-pdlib
 fi
 
 # Install the app

nextcloud_update.sh

@@ -195,6 +195,10 @@ fi
 rm -f /root/php-upgrade.sh
 rm -f /tmp/php-upgrade.sh
 rm -f /root/db-migration.sh
+rm -f /root/migrate-between-psql-versions.sh
+rm -f "$SCRIPTS"/php-upgrade.sh
+rm -f "$SCRIPTS"/db-migration.sh
+rm -f "$SCRIPTS"/migrate-between-psql-versions.sh
 
 # Fix bug in nextcloud.sh
 CURRUSR="$(getent group sudo | cut -d: -f4 | cut -d, -f1)"
@@ -629,7 +633,12 @@ $DOCKER_RUN_OUTPUT"
     # Collabora CODE
     docker_update_specific 'code' 'Collabora'
     # OnlyOffice
-    docker_update_specific 'onlyoffice' 'OnlyOffice'
+    ## Don't upgrade to community if EE is installed
+    if ! does_this_docker_exist onlyoffice-ee
+    then
+        print_text_in_color "$IRed" "Skipping OnlyOffice due to issues with Websockets: https://forum.onlyoffice.com/t/onlyoffice-7-3-websocket-path-changed/3767/5"
+        #docker_update_specific 'onlyoffice' 'OnlyOffice'
+    fi
     # Full Text Search
     docker_update_specific 'fts_esror' 'Full Text Search'
     docker-compose_update 'fts_os-node' 'Full Text Search' "$OPNSDIR"