diff --git a/apps/fulltextsearch.sh b/apps/fulltextsearch.sh index 412ab811..e79442eb 100644 --- a/apps/fulltextsearch.sh +++ b/apps/fulltextsearch.sh @@ -13,6 +13,7 @@ source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercont ncdb nc_update opensearch_install +ncdomain # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/lib.sh b/lib.sh index e8b92832..851d0d64 100644 --- a/lib.sh +++ b/lib.sh @@ -4,6 +4,7 @@ # GNU General Public License v3.0 # https://github.com/nextcloud/vm/blob/master/LICENSE +# shellcheck disable=SC2034 true # see https://github.com/koalaman/shellcheck/wiki/Directive @@ -106,8 +107,6 @@ NCUSER=ncadmin UNIXUSER=$SUDO_USER UNIXUSER_PROFILE="/home/$UNIXUSER/.bash_profile" ROOT_PROFILE="/root/.bash_profile" -# Name in trusted_config -NCDOMAIN=$(nextcloud_occ_no_check config:system:get overwrite.cli.url | sed 's|https://||;s|/||') # User for Bitwarden BITWARDEN_USER=bitwarden BITWARDEN_HOME=/home/"$BITWARDEN_USER" @@ -178,11 +177,15 @@ opensearch_install() { fts_node="fts_os-node" } create_certs(){ - download_script APPS opensearch_certs + download_script APP opensearch_certs check_command sed -i "s|__NCDOMAIN__|$1|" "$SCRIPTS"/opensearch_certs.sh check_command bash "$SCRIPTS"/opensearch_certs.sh rm -f "$SCRIPTS"/opensearch_certs.sh } +# Name in trusted_config +ncdomain() { + NCDOMAIN=$(nextcloud_occ_no_check config:system:get overwrite.cli.url | sed 's|https://||;s|/||') +} # Talk turn_install() { TURN_CONF="/etc/turnserver.conf" diff --git a/menu/additional_apps.sh b/menu/additional_apps.sh index 26de1cb9..a6286279 100644 --- a/menu/additional_apps.sh +++ b/menu/additional_apps.sh @@ -48,7 +48,7 @@ $CHECKLIST_GUIDE\n\n$RUN_LATER_GUIDE" "$WT_HEIGHT" "$WT_WIDTH" 4 \ "Notify Push" "(High Performance Files Backend for Nextcloud)" OFF \ "Talk" "(Video calls and chat for Nextcloud)" OFF \ "Netdata" "(Real-time server monitoring in Web GUI)" OFF \ -"FullTextSearch" "(Elasticsearch for Nextcloud [2GB RAM])" OFF \ +"FullTextSearch" "(Search for text inside documents [4GB RAM])" OFF \ "BPYTOP" "(Real-time server monitoring in CLI)" OFF \ "ClamAV" "(Antivirus for Nextcloud and files)" OFF \ "Midnight Commander" "(CLI file manager)" OFF \ diff --git a/nextcloud_update.sh b/nextcloud_update.sh index 57d831a4..1b9dcace 100644 --- a/nextcloud_update.sh +++ b/nextcloud_update.sh @@ -586,6 +586,7 @@ $DOCKER_RUN_OUTPUT" docker_update_specific 'onlyoffice' 'OnlyOffice' # Full Text Search docker_update_specific 'fts_esror' 'Full Text Search' + docker_update_specific 'fts_os-node' 'Full Text Search' # Plex docker_update_specific 'plex' "Plex Media Server" fi