diff --git a/install/OneClickInstall/install-Debian/install-preq.sh b/install/OneClickInstall/install-Debian/install-preq.sh index 89fd8f3548..42d2c7ca9a 100644 --- a/install/OneClickInstall/install-Debian/install-preq.sh +++ b/install/OneClickInstall/install-Debian/install-preq.sh @@ -10,6 +10,8 @@ cat<> /etc/apt/sources.list echo "deb-src http://ftp.uk.debian.org/debian/ $DISTRIB_CODENAME main contrib" >> /etc/apt/sources.list @@ -144,5 +146,3 @@ if which apparmor_parser && [ ! -f /etc/apparmor.d/disable/usr.sbin.mysqld ] && ln -sf /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/; apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld; fi - -hold_package_version "dotnet-*" "aspnetcore-*" opensearch redis-server rabbitmq-server opensearch-dashboards fluent-bit diff --git a/install/OneClickInstall/install-Debian/tools.sh b/install/OneClickInstall/install-Debian/tools.sh index f96431e9a5..e1265b2522 100644 --- a/install/OneClickInstall/install-Debian/tools.sh +++ b/install/OneClickInstall/install-Debian/tools.sh @@ -26,13 +26,23 @@ command_exists () { # Function to prevent package auto-update hold_package_version() { - for package in "$@"; do - if command -v apt-mark >/dev/null 2>&1 && - dpkg-query -l "$package" >/dev/null 2>&1 - then - apt-mark hold "$package" - fi - done + packages=("dotnet-*" "aspnetcore-*" opensearch redis-server rabbitmq-server opensearch-dashboards fluent-bit) + for package in "${packages[@]}"; do + command -v apt-mark >/dev/null 2>&1 && apt-mark showhold | grep -q "^$package" && apt-mark unhold "$package" + done + + UNATTENDED_UPGRADES_FILE="/etc/apt/apt.conf.d/50unattended-upgrades" + if [ -f ${UNATTENDED_UPGRADES_FILE} ] && grep -q "Package-Blacklist" ${UNATTENDED_UPGRADES_FILE}; then + for package in "${packages[@]}"; do + if ! grep -q "$package" ${UNATTENDED_UPGRADES_FILE}; then + sed -i "/Package-Blacklist/a \\\t\"$package\";" ${UNATTENDED_UPGRADES_FILE} + fi + done + + if systemctl list-units --type=service --state=running | grep -q "unattended-upgrades"; then + systemctl restart unattended-upgrades + fi + fi } check_hardware () { diff --git a/install/OneClickInstall/install-RedHat/install-preq.sh b/install/OneClickInstall/install-RedHat/install-preq.sh index 3074a91f53..390fc8c220 100644 --- a/install/OneClickInstall/install-RedHat/install-preq.sh +++ b/install/OneClickInstall/install-RedHat/install-preq.sh @@ -39,7 +39,7 @@ yum localinstall -y --nogpgcheck https://download1.rpmfusion.org/free/$RPMFUSION [ "$REV" = "9" ] && update-crypto-policies --set DEFAULT:SHA1 if [ "$DIST" == "centos" ]; then - [ "$REV" = "9" ] && TESTING_REPO="--enablerepo=crb" || POWERTOOLS_REPO="--enablerepo=powertools" + [ "$REV" = "9" ] && { ${package_manager} -y install xorg-x11-font-utils; TESTING_REPO="--enablerepo=crb"; } || POWERTOOLS_REPO="--enablerepo=powertools" elif [ "$DIST" == "redhat" ]; then /usr/bin/crb enable fi diff --git a/install/deb/debian/rules b/install/deb/debian/rules index 94d8165ee9..c189c93fae 100644 --- a/install/deb/debian/rules +++ b/install/deb/debian/rules @@ -88,7 +88,7 @@ override_dh_auto_build: check_archives sed -i '/^\[OUTPUT\]/i\[INPUT]' ${BUILDTOOLS_PATH}/install/docker/config/fluent-bit.conf sed -i '/^\[OUTPUT\]/i\ Name exec' ${BUILDTOOLS_PATH}/install/docker/config/fluent-bit.conf sed -i '/^\[OUTPUT\]/i\ Interval_Sec 86400' ${BUILDTOOLS_PATH}/install/docker/config/fluent-bit.conf - sed -i '/^\[OUTPUT\]/i\ Command curl -s -X POST OPENSEARCH_SCHEME://OPENSEARCH_HOST:OPENSEARCH_PORT/OPENSEARCH_INDEX/_delete_by_query -H '\''Content-Type: application/json'\'' -d '\''{"query": {"range": {"@timestamp": {"lt": "now-30d"}}}}'\'' ${BUILDTOOLS_PATH}/install/docker/config/fluent-bit.conf + sed -i '/^\[OUTPUT\]/i\ Command curl -s -X POST OPENSEARCH_SCHEME://OPENSEARCH_HOST:OPENSEARCH_PORT/OPENSEARCH_INDEX/_delete_by_query -H '\''Content-Type: application/json'\'' -d '\''{"query": {"range": {"@timestamp": {"lt": "now-30d"}}}}'\''' ${BUILDTOOLS_PATH}/install/docker/config/fluent-bit.conf sed -i '/^\[OUTPUT\]/i\\' ${BUILDTOOLS_PATH}/install/docker/config/fluent-bit.conf for i in ${PRODUCT} $$(ls ${CURDIR}/debian/*.install | grep -oP 'debian/\K.*' | grep -o '^[^.]*'); do \ diff --git a/install/rpm/SPECS/build.spec b/install/rpm/SPECS/build.spec index 664b4f3ef8..49dc43eb69 100644 --- a/install/rpm/SPECS/build.spec +++ b/install/rpm/SPECS/build.spec @@ -34,7 +34,7 @@ sed -i "s#\(/var/log/onlyoffice/\)#\1%{product}#" install/docker/config/fluent-b sed -i '/^\[OUTPUT\]/i\[INPUT]' install/docker/config/fluent-bit.conf sed -i '/^\[OUTPUT\]/i\ Name exec' install/docker/config/fluent-bit.conf sed -i '/^\[OUTPUT\]/i\ Interval_Sec 86400' install/docker/config/fluent-bit.conf -sed -i '/^\[OUTPUT\]/i\ Command curl -s -X POST OPENSEARCH_SCHEME://OPENSEARCH_HOST:OPENSEARCH_PORT/OPENSEARCH_INDEX/_delete_by_query -H '\''Content-Type: application/json'\'' -d '\''{"query": {"range": {"@timestamp": {"lt": "now-30d"}}}}'\'' ${BUILDTOOLS_PATH}/install/docker/config/fluent-bit.conf +sed -i '/^\[OUTPUT\]/i\ Command curl -s -X POST OPENSEARCH_SCHEME://OPENSEARCH_HOST:OPENSEARCH_PORT/OPENSEARCH_INDEX/_delete_by_query -H '\''Content-Type: application/json'\'' -d '\''{"query": {"range": {"@timestamp": {"lt": "now-30d"}}}}'\''' install/docker/config/fluent-bit.conf sed -i '/^\[OUTPUT\]/i\\' install/docker/config/fluent-bit.conf find %{_builddir}/server/publish/ \ diff --git a/install/rpm/SPECS/install.spec b/install/rpm/SPECS/install.spec index 6769649dcf..6846089986 100644 --- a/install/rpm/SPECS/install.spec +++ b/install/rpm/SPECS/install.spec @@ -25,6 +25,7 @@ mkdir -p "%{buildroot}%{buildpath}/products/ASC.Files/server/DocStore/" mkdir -p "%{buildroot}%{buildpath}/products/ASC.Files/editor/" # Hidden folders are not copied when applying a mask * (only in RPM), so we explicitly copy .next directory in this way mkdir -p "%{buildroot}%{buildpath}/products/ASC.Files/editor/.next/" +mkdir -p "%{buildroot}%{buildpath}/products/ASC.Login/login/.next/" mkdir -p "%{buildroot}%{buildpath}/products/ASC.Files/client/" mkdir -p "%{buildroot}%{buildpath}/client/" mkdir -p "%{buildroot}%{buildpath}/management/" @@ -40,6 +41,7 @@ mkdir -p "%{buildroot}%{_bindir}/" cp -rf %{_builddir}/publish/web/public/* "%{buildroot}%{buildpath}/public/" cp -rf %{_builddir}/campaigns/src/campaigns/* "%{buildroot}%{buildpath}/public/campaigns" cp -rf %{_builddir}/publish/web/login/* "%{buildroot}%{buildpath}/products/ASC.Login/login/" +cp -rf %{_builddir}/publish/web/login/.next/* "%{buildroot}%{buildpath}/products/ASC.Login/login/.next/" cp -rf %{_builddir}/publish/web/editor/* "%{buildroot}%{buildpath}/products/ASC.Files/editor/" cp -rf %{_builddir}/publish/web/editor/.next/* "%{buildroot}%{buildpath}/products/ASC.Files/editor/.next/" cp -rf %{_builddir}/server/products/ASC.Files/Server/DocStore/* "%{buildroot}%{buildpath}/products/ASC.Files/server/DocStore/"