IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/logo-handler' of github.com:ONLYOFFICE/DocSpace-buildtools into feature/logo-handler

Browse Source
This commit is contained in:
Ilya Oleshko 2024-04-03 17:51:44 +03:00
commit 42310f5e86
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
install/OneClickInstall/install-Docker.sh
View File

@ -1304,6 +1304,7 @@ install_product () {
reconfigure EXTERNAL_PORT ${EXTERNAL_PORT} reconfigure EXTERNAL_PORT ${EXTERNAL_PORT}
docker-compose -f $BASE_DIR/migration-runner.yml up -d docker-compose -f $BASE_DIR/migration-runner.yml up -d
docker wait ${PACKAGE_SYSNAME}-migration-runner
docker-compose -f $BASE_DIR/${PRODUCT}.yml up -d docker-compose -f $BASE_DIR/${PRODUCT}.yml up -d
docker-compose -f ${PROXY_YML} up -d docker-compose -f ${PROXY_YML} up -d
docker-compose -f $BASE_DIR/notify.yml up -d docker-compose -f $BASE_DIR/notify.yml up -d

4
install/common/product-configuration
View File

@ -619,7 +619,9 @@ change_elasticsearch_config(){
sed -i '/^plugins\.security/d' /etc/opensearch/opensearch.yml sed -i '/^plugins\.security/d' /etc/opensearch/opensearch.yml
sed -i '/CN=kirk,OU=client,O=client,L=test, C=de/d' /etc/opensearch/opensearch.yml sed -i '/CN=kirk,OU=client,O=client,L=test, C=de/d' /etc/opensearch/opensearch.yml
/usr/share/opensearch/bin/opensearch-plugin remove opensearch-security if /usr/share/opensearch/bin/opensearch-plugin list | grep -x "opensearch-security" > /dev/null 2>&1 ; then
/usr/share/opensearch/bin/opensearch-plugin remove opensearch-security > /dev/null 2>&1
fi
local ELASTIC_SEARCH_CONF_PATH="/etc/opensearch/opensearch.yml" local ELASTIC_SEARCH_CONF_PATH="/etc/opensearch/opensearch.yml"
local ELASTIC_SEARCH_JAVA_CONF_PATH="/etc/opensearch/jvm.options"; local ELASTIC_SEARCH_JAVA_CONF_PATH="/etc/opensearch/jvm.options";