Merge branch 'testing' into package_upgrade

README.md

@@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 own data. A personal cloud which run on your own server. With Nextcloud
 you can synchronize your files over your devices.
 
-**Shipped version:** 15.0.4
+**Shipped version:** 15.0.5
 
 ## Screenshots
 

conf/nginx.conf

@@ -16,7 +16,7 @@ location ^~ __PATH__ {
   }
 
   # Add headers to serve security related headers
-  more_set_headers "Strict-Transport-Security: max-age=15768000";
+  more_set_headers "Strict-Transport-Security: max-age=15768000; includeSubDomains; preload;";
   more_set_headers "X-Content-Type-Options: nosniff";
   more_set_headers "X-XSS-Protection: 1; mode=block";
   more_set_headers "X-Robots-Tag: none";
@@ -62,9 +62,9 @@ location ^~ __PATH__ {
     deny all;
   }
 
-  location ~ ^__PATH__/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|core/templates/40[34])\.php(?:$|/) {
+  location ~ ^__PATH__/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|ocm-provider/.+)\.php(/.*|)$ {
     include fastcgi_params;
-    fastcgi_split_path_info ^(.+\.php)(/.+)$;
+    fastcgi_split_path_info ^(.+\.php)(/.*|)$;
     fastcgi_param SCRIPT_FILENAME $request_filename;
     fastcgi_param PATH_INFO $fastcgi_path_info;
     fastcgi_param HTTPS on;
@@ -74,14 +74,15 @@ location ^~ __PATH__ {
     fastcgi_intercept_errors on;
   }
 
-  location ~ ^__PATH__/(?:updater|ocs-provider)(?:$|/) {
+  location ~ ^__PATH__/(?:updater|ocs-provider|ocm-provider)(?:$|/) {
     try_files $uri/ =404;
     index index.php;
   }
 
   # Adding the cache control header for js and css files
-  location ~* \.(?:css|js)$ {
-    more_set_headers "Cache-Control: public, max-age=7200";
+  location ~ ^__PATH__/.+[^/]\.(?:css|js|woff2?|svg|gif)$ {
+    try_files $uri __PATH__/index.php$request_uri;
+    more_set_headers "Cache-Control: public, max-age=15778463";
     # Add headers to serve security related headers
     more_set_headers "Strict-Transport-Security: max-age=15768000";
     more_set_headers "X-Content-Type-Options: nosniff";
@@ -95,7 +96,7 @@ location ^~ __PATH__ {
     access_log off;
   }
 
-  location ~* \.(?:svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$ {
+  location ~* \.(?:png|html|ttf|ico|jpg|jpeg)$ {
     # Optional: Don't log access to other assets
     access_log off;
   }

manifest.json

@@ -6,7 +6,7 @@
         "en": "Access & share your files, calendars, contacts, mail & more from any device, on your terms",
         "fr": "Consultez et partagez vos fichiers, agendas, carnets d'adresses, emails et bien plus depuis les appareils de votre choix, sous vos conditions"
     },
-    "version": "15.0.4~ynh2",
+    "version": "15.0.5~ynh1",
     "url": "https://nextcloud.com",
     "license": "AGPL-3.0",
     "maintainer": {

scripts/install

@@ -231,6 +231,12 @@ exec_occ config:system:get logout_url >/dev/null 2>&1 \
 //-YunoHost-
 " >> "$final_path/config/config.php"
 
+#=================================================
+# CHANGE HOSTNAME FOR ACTIVITY NOTIFICATIONS
+#=================================================
+
+ynh_replace_string "'overwrite.cli.url' => 'http://localhost'," "'overwrite.cli.url' => 'https://${domain}'," "${final_path}/config/config.php"
+
 #=================================================
 # REMOVE THE TEMPORARY ADMIN AND SET THE TRUE ONE
 #=================================================

scripts/upgrade

@@ -279,6 +279,12 @@ exec_occ config:system:get logout_url >/dev/null 2>&1 \
 //-YunoHost-
 " >> "$final_path/config/config.php"
 
+#=================================================
+# CHANGE HOSTNAME FOR ACTIVITY NOTIFICATIONS
+#=================================================
+
+ynh_replace_string "'overwrite.cli.url' => 'http://localhost'," "'overwrite.cli.url' => 'https://${domain}'," "${final_path}/config/config.php"
+
 #=================================================
 # MOUNT HOME FOLDERS AS EXTERNAL STORAGE
 #=================================================

scripts/upgrade.d/upgrade.last.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 # Last available nextcloud version
-next_version="15.0.4"
+next_version="15.0.5"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="f87db047c174f563e391a22c959d9ace767ca14ef0f97fc394f3061fc63d8f77"
+nextcloud_source_sha256="4661869b797a340cd967abb3dbe6931b375434e0a44480346a27ccd73250b988"
 
 # This function will only be executed upon applying the last upgrade referenced above
 last_upgrade_operations () {