[v1.7.1] fix error on elasticsearch installation

zepgram · Mar 27, 2023 · fea0b9a · fea0b9a
1 parent 73af199
commit fea0b9a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/provision/001-system-env.sh b/provision/001-system-env.sh
@@ -35,8 +35,14 @@ fi
 
 # search engine
 SEARCH_ENGINE=${21}
-if [ "$SEARCH_ENGINE" != "opensearch" ] || $(dpkg --compare-versions "${PROJECT_VERSION}" "lt" "2.4.6"); then
- SEARCH_ENGINE='elasticsearch'
+if [ "$SEARCH_ENGINE" != "opensearch" ]; then
+    if $(dpkg --compare-versions "${PROJECT_VERSION}" "ge" "2.4.6"); then
+       SEARCH_ENGINE='elasticsearch8'
+    elif $(dpkg --compare-versions "${PROJECT_VERSION}" "ge" "2.4.0"); then
+       SEARCH_ENGINE='elasticsearch7'
+    else
+       SEARCH_ENGINE='elasticsearch6'
+    fi
 fi
 
 # two factor auth

diff --git a/provision/120-magento-post.sh b/provision/120-magento-post.sh
@@ -89,13 +89,7 @@ if $(dpkg --compare-versions "${PROJECT_VERSION}" "gt" "2.2"); then
   if [ "$PROJECT_SEARCH_ENGINE" == "opensearch" ]; then
     sudo -u vagrant "$PROJECT_PATH"/bin/magento config:set "catalog/search/engine" "opensearch"
   else
-    if $(dpkg --compare-versions "${PROJECT_VERSION}" "ge" "2.4.6"); then
-      sudo -u vagrant "$PROJECT_PATH"/bin/magento config:set "catalog/search/engine" "elasticsearch8"
-    elif $(dpkg --compare-versions "${PROJECT_VERSION}" "ge" "2.4.0"); then
-      sudo -u vagrant "$PROJECT_PATH"/bin/magento config:set "catalog/search/engine" "elasticsearch7"
-    else
-      sudo -u vagrant "$PROJECT_PATH"/bin/magento config:set "catalog/search/engine" "elasticsearch6"
-    fi
+      sudo -u vagrant "$PROJECT_PATH"/bin/magento config:set "catalog/search/engine" $PROJECT_SEARCH_ENGINE
   fi
 else
   # Force https on unsecure request for older versions