Merge remote-tracking branch 'aalaesar/master' into multi-os

README.md

@@ -159,7 +159,7 @@ The list of domains you will use to access the same Nextcloud instance.
 ```YAML
 nextcloud_trusted_proxies: []
 ```
-The list of trusted proxies IPs if Nextcloud runs through a reverse proxy you.
+The list of trusted proxies IPs if Nextcloud runs through a reverse proxy.
 ```YAML
 nextcloud_instance_name: "{{ nextcloud_trusted_domain | first }}"
 ```
@@ -193,11 +193,16 @@ Defines the Nextcloud admin's login.
 ```YAML
 nextcloud_admin_pwd: "secret"
 ```
-Defines the Nextcloud admin's password.
+Defines the Nextcloud admin's password.  
+**Not defined by default**  
+If not defined by the user, a random password will be generated.
 
-**Not defined by default**
+```YAML
+nextcloud_max_upload_size: "512m"
+```
+Defines the max size allowed to be uploaded on the server.  
+Use 0 to __disable__.
 
-If not defined by the user, a random password will be generated.
 ### Redis Server configuration
 ```YAML
 nextcloud_install_redis_server: true
@@ -234,7 +239,7 @@ nextcloud_config_settings:
   - { name: 'mysql.utf8mb4', value: 'true' }
   - { name: 'updater.release.channel', value: 'production' } # production | stable | daily | beta
 ```
-Setting custom Nextcloud setting in config.php ( [Config.php Parameters Documentations](https://docs.nextcloud.com/server/12/admin_manual/configuration_server/config_sample_php_parameters.html) )
+Setting custom Nextcloud setting in config.php ( [Config.php Parameters Documentations](https://docs.nextcloud.com/server/stable/admin_manual/) )
 
 Default custom settings:
 -   **Base URL**: 'https:// {{nextcloud_instance_name}}'

templates/nginx_nc.j2

@@ -114,7 +114,7 @@ server {
     error_page 404 /core/templates/404.php;
 
     location / {
-        rewrite ^ /index.php$uri;
+        rewrite ^ /index.php;
     }
 
     location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ {
@@ -124,9 +124,10 @@ server {
         deny all;
     }
 
-    location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|core/templates/40[34])\.php(?:$|/) {
+    location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|oc[ms]-provider/.+|core/templates/40[34])\.php(?:$|/) {
         # include fastcgi_params;
         fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        try_files $fastcgi_script_name =404;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_param PATH_INFO $fastcgi_path_info;
@@ -139,7 +140,7 @@ server {
         #fastcgi_request_buffering off;
     }
 
-    location ~ ^/(?:updater|ocs-provider)(?:$|/) {
+    location ~ ^/(?:updater|oc[ms]-provider)(?:$|/) {
         try_files $uri/ =404;
         index index.php;
     }