From 7ba4f6ead9cfa9af2478125e79907a7021cda1bc7f1a29feb54735ccc09960a3 Mon Sep 17 00:00:00 2001 From: Eric Schirra <ecsos@schirra.net> Date: Sun, 29 Mar 2020 22:05:36 +0000 Subject: [PATCH] Accepting request 789580 from home:oreinert:branches:server:php:applications - Enable Apache PHP module on first install only, not on updates - Make crontab and timer consistent: 5 minutes between jobs OBS-URL: https://build.opensuse.org/request/show/789580 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/nextcloud?expand=0&rev=106 --- nextcloud-cron | 4 ++-- nextcloud.changes | 6 ++++++ nextcloud.spec | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nextcloud-cron b/nextcloud-cron index 54bc3aa..c83ec90 100644 --- a/nextcloud-cron +++ b/nextcloud-cron @@ -1,9 +1,9 @@ # -# Nextcloud CronJob every 15 minutes. +# Nextcloud CronJob every 5 minutes. # # Uncomment to enable it. SHELL=/bin/sh PATH=/sbin:/bin:/usr/sbin:/usr/bin -#*/15 * * * * wwwrun /usr/bin/php -f /srv/www/htdocs/nextcloud/cron.php /dev/null 2>&1 +#*/5 * * * * wwwrun /usr/bin/php -f /srv/www/htdocs/nextcloud/cron.php /dev/null 2>&1 diff --git a/nextcloud.changes b/nextcloud.changes index 7d06cf2..5d23649 100644 --- a/nextcloud.changes +++ b/nextcloud.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Mar 29 20:54:25 UTC 2020 - Olav Reinert <seroton10@gmail.com> + +- Enable Apache PHP module on first install only, not on updates +- Make crontab and timer consistent: 5 minutes between jobs + ------------------------------------------------------------------- Tue Mar 24 19:20:52 UTC 2020 - Michael Ströder <michael@stroeder.com> diff --git a/nextcloud.spec b/nextcloud.spec index 8058b6a..8864f33 100644 --- a/nextcloud.spec +++ b/nextcloud.spec @@ -248,6 +248,7 @@ else echo "%{name} Upgrade complete" fi +if [ $1 -eq 1 ]; then %if 0%{?suse_version} %if 0%{?suse_version} >= 1500 # make sure php7 is not in APACHE_MODULES, so that we don't create dups. @@ -261,6 +262,7 @@ perl -pani -e 's@^(APACHE_MODULES=".*)\bphp5\b@$1@' /etc/sysconfig/apache2 perl -pani -e 's@^(APACHE_MODULES=")@${1}php5 @' /etc/sysconfig/apache2 %endif %endif +fi if [ -s %{statedir}/apache_stopped_during_nextcloud_install ]; then echo "%{name} post-install: Restarting Apache"