Merge branch 'testing' into 24.0.0

README.md

@@ -19,7 +19,6 @@ Online storage, file sharing platform and various other applications
 
 **Shipped version:** 24.0.3~ynh1
 
-
 **Demo:** https://demo.nextcloud.com/
 
 ## Screenshots

README_fr.md

@@ -19,7 +19,6 @@ Stockage en ligne, plateforme de partage de fichiers et diverses autres applicat
 
 **Version incluse :** 24.0.3~ynh1
 
-
 **Démo :** https://demo.nextcloud.com/
 
 ## Captures d'écran

conf/nginx.conf

@@ -8,7 +8,7 @@ location ^~ /.well-known {
 
   location = /.well-known/carddav     { return 301 __PATH__/remote.php/dav/; }
   location = /.well-known/caldav      { return 301 __PATH__/remote.php/dav/; }
- 
+
   location = /.well-known/webfinger     { return 301 __PATH__/index.php$uri; }
   location = /.well-known/nodeinfo      { return 301 __PATH__/index.php$uri; }
 
@@ -62,9 +62,6 @@ location ^~ __PATH__/ {
   # always provides the desired behaviour.
   index index.php index.html __PATH__/index.php$request_uri;
 
-  # Default Cache-Control policy
-  expires 1m;
-
   # Rule borrowed from `.htaccess` to handle Microsoft DAV clients
   location = __PATH__/ {
       if ( $http_user_agent ~ ^DavClnt ) {

manifest.json

@@ -14,7 +14,8 @@
         "demo": "https://demo.nextcloud.com/",
         "admindoc": "https://docs.nextcloud.com/server/stable/admin_manual/",
         "userdoc": "https://docs.nextcloud.com/server/latest/user_manual/en/",
-        "code": "https://github.com/nextcloud/server"
+        "code": "https://github.com/nextcloud/server",
+        "cpe": "cpe:2.3:a:nextcloud:nextcloud"
     },
     "license": "AGPL-3.0",
     "maintainer": {
@@ -31,7 +32,7 @@
         "mysql"
     ],
     "arguments": {
-        "install" : [
+        "install": [
             {
                 "name": "domain",
                 "type": "domain"
@@ -66,4 +67,4 @@
             }
         ]
     }
-}
+}