diff --git a/install/OneClickInstall/install-Docker.sh b/install/OneClickInstall/install-Docker.sh index bb3a95578c..7b337ecff1 100644 --- a/install/OneClickInstall/install-Docker.sh +++ b/install/OneClickInstall/install-Docker.sh @@ -1316,6 +1316,7 @@ install_elasticsearch () { install_fluent_bit () { if [ "$INSTALL_FLUENT_BIT" == "true" ]; then curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh + systemctl enable fluent-bit if systemctl list-unit-files --type=service | grep -q "fluent-bit.service"; then sed -i "s/OPENSEARCH_SCHEME/$(get_env_parameter "ELK_SHEME")/g" "${BASE_DIR}/config/fluent-bit.conf" @@ -1326,6 +1327,13 @@ install_fluent_bit () { cp -rf ${BASE_DIR}/config/fluent-bit.conf /etc/fluent-bit/fluent-bit.conf systemctl restart fluent-bit + DOCKER_SYSTEMD_DIR="/etc/systemd/system/docker.service.d" + if [ ! -f "${DOCKER_SYSTEMD_DIR}/fluent-after.conf" ]; then + mkdir -p ${DOCKER_SYSTEMD_DIR} + echo -e "[Unit]\n$(grep After= $(systemctl show -p FragmentPath docker.service | awk -F= '{print $2}')) fluent-bit.service" > "${DOCKER_SYSTEMD_DIR}/fluent-after.conf" + systemctl daemon-reload + fi + DOCKER_DAEMON_FILE="/etc/docker/daemon.json" if [[ ! -f "${DOCKER_DAEMON_FILE}" ]]; then echo "{\"log-driver\": \"fluentd\", \"log-opts\": { \"fluentd-address\": \"127.0.0.1:24224\" }}" > "${DOCKER_DAEMON_FILE}" diff --git a/install/deb/debian/source/lintian-overrides b/install/deb/debian/source/lintian-overrides index 0c20c13e87..8386cd8f21 100644 --- a/install/deb/debian/source/lintian-overrides +++ b/install/deb/debian/source/lintian-overrides @@ -1,13 +1,15 @@ # Ignoring node_modules errors due to lack of ability to influence them -embedded-javascript-library var/www/{{product}}/services/*/node_modules/* +embedded-javascript-library var/www/{{product}}/*/node_modules/* # Ignoring node_modules errors due to lack of ability to influence them -executable-not-elf-or-script var/www/{{product}}/services/*/node_modules/* +executable-not-elf-or-script var/www/{{product}}/*/node_modules/* # Ignoring node_modules errors due to lack of ability to influence them -privacy-breach-generic var/www/{{product}}/services/*/node_modules/* +privacy-breach-generic var/www/{{product}}/*/node_modules/* # Ignoring node_modules errors due to lack of ability to influence them -script-not-executable var/www/{{product}}/services/*/node_modules/* +script-not-executable var/www/{{product}}/*/node_modules/* # Ignoring node_modules errors due to lack of ability to influence them unusual-interpreter */node_modules/* +# Ignoring node_modules errors due to lack of ability to influence them +statically-linked-binary var/www/{{product}}/*/node_modules/* # The use of the /var/www directory is caused by its past history as the default document root dir-or-file-in-var-www diff --git a/install/docker/dashboards.yml b/install/docker/dashboards.yml index ec7b0ddd74..fe18d0b2cf 100644 --- a/install/docker/dashboards.yml +++ b/install/docker/dashboards.yml @@ -1,4 +1,3 @@ -version: "3" services: onlyoffice-opensearch-dashboards: image: opensearchproject/opensearch-dashboards:${DASHBOARDS_VERSION}