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..b417b07 100644 --- a/nextcloud.changes +++ b/nextcloud.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +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 + +- 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..8e58a7d 100644 --- a/nextcloud.spec +++ b/nextcloud.spec @@ -248,19 +248,15 @@ 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. -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 if [ -s %{statedir}/apache_stopped_during_nextcloud_install ]; then echo "%{name} post-install: Restarting Apache" @@ -312,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