diff --git a/install/common/logrotate/product-common b/install/common/logrotate/product-common deleted file mode 100644 index 66a81ce9ab..0000000000 --- a/install/common/logrotate/product-common +++ /dev/null @@ -1,16 +0,0 @@ -/var/log/onlyoffice/docspace/*.log { - daily - missingok - rotate 30 - compress - dateext - delaycompress - notifempty - nocreate - sharedscripts - postrotate - if pgrep -x ""systemd"" >/dev/null; then - systemctl restart docspace* > /dev/null - fi - endscript -} diff --git a/install/deb/debian/control b/install/deb/debian/control index fd17bc8dfe..18e9b1fcd8 100644 --- a/install/deb/debian/control +++ b/install/deb/debian/control @@ -40,7 +40,7 @@ Description: {{product}} Package: {{product}}-common Architecture: all Multi-Arch: foreign -Depends: adduser, logrotate, ${misc:Depends}, ${shlibs:Depends} +Depends: adduser, ${misc:Depends}, ${shlibs:Depends} Recommends: default-mysql-client Description: {{product}}-common A package containing configs and scripts diff --git a/install/deb/debian/product-common.install b/install/deb/debian/product-common.install index 2f3a5de1c7..60aaa49f2e 100644 --- a/install/deb/debian/product-common.install +++ b/install/deb/debian/product-common.install @@ -1,5 +1,4 @@ debian/build/buildtools/config/*.json etc/onlyoffice/{{product}} debian/build/buildtools/config/*.config etc/onlyoffice/{{product}} debian/build/buildtools/install/common/{{product}}-configuration usr/bin -debian/build/buildtools/install/common/logrotate/{{product}}-common etc/logrotate.d debian/build/buildtools/install/docker/config/fluent-bit.conf etc/onlyoffice/{{product}} diff --git a/install/rpm/SPECS/files.spec b/install/rpm/SPECS/files.spec index aa8073a1ad..70b30262e3 100644 --- a/install/rpm/SPECS/files.spec +++ b/install/rpm/SPECS/files.spec @@ -34,7 +34,6 @@ %exclude %{_sysconfdir}/onlyoffice/%{product}/openresty %exclude %{_sysconfdir}/onlyoffice/%{product}/nginx %{_docdir}/%{name}-%{version}-%{release}/ -%config %{_sysconfdir}/logrotate.d/%{product}-common %{_var}/log/onlyoffice/%{product}/ %dir %{_sysconfdir}/onlyoffice/ %dir %{_sysconfdir}/onlyoffice/%{product}/ diff --git a/install/rpm/SPECS/install.spec b/install/rpm/SPECS/install.spec index e9a53680b1..6769649dcf 100644 --- a/install/rpm/SPECS/install.spec +++ b/install/rpm/SPECS/install.spec @@ -34,7 +34,6 @@ mkdir -p "%{buildroot}%{_sysconfdir}/openresty/conf.d/" mkdir -p "%{buildroot}%{_sysconfdir}/openresty/html/" mkdir -p "%{buildroot}%{_sysconfdir}/onlyoffice/%{product}/openresty" mkdir -p "%{buildroot}%{_sysconfdir}/onlyoffice/%{product}/.private/" -mkdir -p "%{buildroot}%{_sysconfdir}/logrotate.d" mkdir -p "%{buildroot}%{_sysconfdir}/fluent-bit/" mkdir -p "%{buildroot}%{_docdir}/%{name}-%{version}-%{release}/" mkdir -p "%{buildroot}%{_bindir}/" @@ -69,7 +68,6 @@ cp -rf %{_builddir}/buildtools/install/docker/config/nginx/onlyoffice-proxy.conf cp -rf %{_builddir}/buildtools/install/docker/config/nginx/onlyoffice-proxy-ssl.conf "%{buildroot}%{_sysconfdir}/openresty/conf.d/onlyoffice-proxy-ssl.conf.template" cp -rf %{_builddir}/buildtools/install/docker/config/nginx/letsencrypt.conf "%{buildroot}%{_sysconfdir}/openresty/includes/letsencrypt.conf" cp -rf %{_builddir}/buildtools/install/common/systemd/modules/* "%{buildroot}/usr/lib/systemd/system/" -cp -rf %{_builddir}/buildtools/install/common/logrotate/product-common "%{buildroot}%{_sysconfdir}/logrotate.d/%{product}-common" cp -rf %{_builddir}/buildtools/install/common/%{product}-ssl-setup "%{buildroot}%{_bindir}/%{product}-ssl-setup" cp -rf %{_builddir}/buildtools/install/common/%{product}-configuration "%{buildroot}%{_bindir}/%{product}-configuration" cp -rf %{_builddir}/buildtools/config/nginx/onlyoffice*.conf "%{buildroot}%{_sysconfdir}/openresty/conf.d/" diff --git a/install/rpm/SPECS/package.spec b/install/rpm/SPECS/package.spec index ed8879e870..767e1eae74 100644 --- a/install/rpm/SPECS/package.spec +++ b/install/rpm/SPECS/package.spec @@ -13,7 +13,6 @@ The service which handles API requests related to backup Packager: %{packager} Summary: Common Group: Applications/Internet -Requires: logrotate BuildArch: noarch %description common A package containing configure and scripts