Accepting request 668329 from home:ecsos:server

- Fix paths in cron and service file.

OBS-URL: https://build.opensuse.org/request/show/668329
OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=22
This commit is contained in:
Eric Schirra 2019-01-24 14:22:18 +00:00 committed by Git OBS Bridge
parent d43c21fa61
commit 63798be294
4 changed files with 9 additions and 3 deletions

View File

@ -3,7 +3,7 @@
# #
# without CLI # without CLI
#5 * * * * wwwrun %{_bindir}/php %{ap_serverroot}/%{name}/misc/cron/archive.php --url=http://localhost/matomo/ > /var/log/%{name}/%{name}-archive.log #5 * * * * wwwrun /usr/bin/php @ap_serverroot@/matomo/misc/cron/archive.php --url=http://localhost/matomo/ > /var/log/matomo/matomo-archive.log
# with CLI # with CLI
5 * * * * wwwrun %{_bindir}/php %{ap_serverroot}/%{name}/console core:archive --url=http://localhost/matomo/ > /var/log/%{name}/%{name}-archive.log 5 * * * * wwwrun /usr/bin/php @ap_serverroot@/matomo/console core:archive --url=http://localhost/matomo/ > /var/log/matomo/matomo-archive.log

View File

@ -5,6 +5,6 @@ Description=Auto-Archiving of matomo Reports
Type=oneshot Type=oneshot
User=wwwrun User=wwwrun
Group=www Group=www
ExecStart=/bin/bash -ce "/usr/bin/php /srv/www/matomo/console core:archive --url=http://localhost/matomo/ >> /var/log/matomo/matomo-archive.log 2>&1" ExecStart=/bin/bash -ce "/usr/bin/php @ap_serverroot@/matomo/console core:archive --url=http://localhost/matomo/ >> /var/log/matomo/matomo-archive.log 2>&1"
#StandardOutput=file:/var/log/matomo/matomo-archive.log #StandardOutput=file:/var/log/matomo/matomo-archive.log
#StandardError=file:/var/log/matomo/matomo-archive.log #StandardError=file:/var/log/matomo/matomo-archive.log

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jan 24 14:17:44 UTC 2019 - ecsos@opensuse.org
- Fix paths in cron and service file.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 22 12:31:47 UTC 2019 - ecsos@opensuse.org Tue Jan 22 12:31:47 UTC 2019 - ecsos@opensuse.org

View File

@ -124,6 +124,7 @@ install -d -m 0755 %{buildroot}/var/log/%{name}
install -D -m 0644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/cron.d/%{name}-archive install -D -m 0644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/cron.d/%{name}-archive
install -D -m 0644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}-archive.service install -D -m 0644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}-archive.service
install -D -m 0644 %{SOURCE12} %{buildroot}%{_unitdir}/%{name}-archive.timer install -D -m 0644 %{SOURCE12} %{buildroot}%{_unitdir}/%{name}-archive.timer
sed -i -e 's|@ap_serverroot@|%{ap_serverroot}|g' %{buildroot}%{_sysconfdir}/cron.d/%{name}-archive
sed -i -e 's|@ap_serverroot@|%{ap_serverroot}|g' %{buildroot}%{_unitdir}/%{name}-archive.service sed -i -e 's|@ap_serverroot@|%{ap_serverroot}|g' %{buildroot}%{_unitdir}/%{name}-archive.service
%fdupes %{buildroot}/%{_prefix} %fdupes %{buildroot}/%{_prefix}