From 7ba4f6ead9cfa9af2478125e79907a7021cda1bc7f1a29feb54735ccc09960a3 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Sun, 29 Mar 2020 22:05:36 +0000 Subject: [PATCH 1/2] 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 + +- 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 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" From 2dbade356f7a07fa801d980961ce29e3b65fe9a867d451348dbc31c66e324fac Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Sun, 12 Apr 2020 20:03:35 +0000 Subject: [PATCH 2/2] Accepting request 793414 from home:oreinert:branches:server:php:applications - Make core/js/mimetypelist.js writable * Fixes "occ maintenance:mimetype:update-js" command * Allows apps to register new mimetypes - Make core/img/filetypes/ writable * Allows apps to register new file icons - Use standard a2enmod command to manipulate Apache module list The first two items are bugfixes. Without them, apps that define new file types (e.g., the MindMap app) cause issues, even to the point of breaking the Activity page. The last item is cosmetic, but I figure the use of a dedicated purpose-built command is easier to read and maintain than custom Perl scripts? OBS-URL: https://build.opensuse.org/request/show/793414 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/nextcloud?expand=0&rev=107 --- nextcloud.changes | 10 ++++++++++ nextcloud.spec | 12 ++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/nextcloud.changes b/nextcloud.changes index 5d23649..b417b07 100644 --- a/nextcloud.changes +++ b/nextcloud.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Apr 12 13:20:14 UTC 2020 - Olav Reinert + +- Make core/js/mimetypelist.js writable + * Fixes "occ maintenance:mimetype:update-js" command + * Allows apps to register new mimetypes +- Make core/img/filetypes/ writable + * Allows apps to register new file icons +- Use standard a2enmod command to manipulate Apache module list + ------------------------------------------------------------------- Sun Mar 29 20:54:25 UTC 2020 - Olav Reinert diff --git a/nextcloud.spec b/nextcloud.spec index 8864f33..8e58a7d 100644 --- a/nextcloud.spec +++ b/nextcloud.spec @@ -251,15 +251,9 @@ 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. -perl -pani -e 's@^(APACHE_MODULES=".*)\bphp7\b@$1@' /etc/sysconfig/apache2 -# add php7 to APACHE_MODULES -perl -pani -e 's@^(APACHE_MODULES=")@${1}php7 @' /etc/sysconfig/apache2 +a2enmod php7 %else -# make sure php5 is not in APACHE_MODULES, so that we don't create dups. -perl -pani -e 's@^(APACHE_MODULES=".*)\bphp5\b@$1@' /etc/sysconfig/apache2 -# add php5 to APACHE_MODULES -perl -pani -e 's@^(APACHE_MODULES=")@${1}php5 @' /etc/sysconfig/apache2 +a2enmod php5 %endif %endif fi @@ -314,6 +308,8 @@ rm -f %{statedir}/occ_maintenance_mode_during_nextcloud_install %config(noreplace) %{apache_serverroot}/%{name}/.user.ini %defattr(664,wwwrun,www,775) %{apache_serverroot}/%{name}/apps +%{apache_serverroot}/%{name}/core/js/mimetypelist.js +%dir %{apache_serverroot}/%{name}/core/img/filetypes %defattr(660,wwwrun,www,770) %{apache_serverroot}/%{name}/config %{apache_serverroot}/%{name}/data