1 files changed, 25 insertions, 26 deletions

diff --git a/roles/nextcloud/files/etc/nginx/sites-available/nextcloud b/roles/nextcloud/files/etc/nginx/sites-available/nextcloud
index 9e5e9b0..e8820ca 100644
--- a/roles/nextcloud/files/etc/nginx/sites-available/nextcloud
+++ b/roles/nextcloud/files/etc/nginx/sites-available/nextcloud
@@ -4,10 +4,10 @@ server {
 
     server_name cloud.fripost.org;
 
-    include snippets/acme-challenge.conf;
+    include /etc/lacme/nginx.conf;
 
-    access_log  /var/log/nginx/cloud.access.log;
-    error_log   /var/log/nginx/cloud.error.log info;
+    access_log /var/log/nginx/cloud.access.log;
+    error_log  /var/log/nginx/cloud.error.log info;
 
     location / {
         return 301 https://$host$request_uri;
@@ -20,10 +20,10 @@ server {
 
     server_name cloud.fripost.org;
 
-    root /var/www/nextcloud/;
+    root /usr/local/share/nextcloud;
 
     include snippets/headers.conf;
-    add_header X-Robots-Tag                      none;
+    add_header X-Robots-Tag                      "noindex, nofollow";
     add_header X-Download-Options                noopen;
     add_header X-Permitted-Cross-Domain-Policies none;
 
@@ -38,11 +38,12 @@ server {
         access_log off;
     }
 
-    access_log  /var/log/nginx/cloud.access.log;
-    error_log   /var/log/nginx/cloud.error.log info;
+    access_log /var/log/nginx/cloud.access.log;
+    error_log  /var/log/nginx/cloud.error.log info;
 
-    location = /.well-known/carddav { return 301 $scheme://$host/remote.php/dav; }
-    location = /.well-known/caldav  { return 301 $scheme://$host/remote.php/dav; }
+    location = /.well-known/carddav { return 301 /remote.php/dav; }
+    location = /.well-known/caldav  { return 301 /remote.php/dav; }
+    location ^~ /.well-known/       { return 301 /index.php$request_uri; }
 
     # set max upload size
     client_max_body_size 512M;
@@ -57,40 +58,38 @@ server {
     gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
     gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
 
-    error_page 403 /core/templates/403.php;
-    error_page 404 /core/templates/404.php;
-
-    location = / { return 303 $scheme://$host/apps/files/; }
+    location = / { return 303 /apps/files/; }
     location   / { rewrite ^ /index.php$uri last; }
 
     location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ { internal; }
     location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console)         { internal; }
 
-    location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|core/templates/40[34])\.php(?:$|/) {
-        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+    location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|oc[ms]-provider/.+|core/templates/40[34])\.php(?:$|/) {
         include snippets/fastcgi-php.conf;
         fastcgi_param modHeadersAvailable     true;
         fastcgi_param front_controller_active true;
+        fastcgi_intercept_errors on;
         fastcgi_request_buffering off;
-        fastcgi_param PHP_VALUE "upload_max_filesize=512M
-                                 post_max_size=512M
-                                 memory_limit=512M";
-        fastcgi_param PHP_ADMIN_VALUE "open_basedir=$document_root:/mnt/nextcloud-data:/etc/nextcloud:/usr/share/php:/tmp:/dev";
+        fastcgi_pass  unix:/run/php/php7.3-fpm@nextcloud.sock;
     }
 
-    location ~ ^/(?:updater|ocs-provider)(?:$|/) {
+    location ~ ^/(?:updater|oc[ms]-provider)(?:$|/) {
         try_files $uri/ =404;
         index index.php;
     }
 
-    location ~* \.(?:css|js|woff|svg|gif)$ {
-        try_files $uri /index.php$uri$is_args$args;
+    location ~ \.(?:css|js|woff2?|svg|gif|map)$ {
         expires 30d;
+        try_files $uri /index.php$uri$is_args$args;
     }
 
-    location ~* \.(?:png|html|ttf|ico|jpg|jpeg)$ {
+    location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ {
         try_files $uri /index.php$uri$is_args$args;
     }
+
+    location = /core/img/favicon.ico {
+        alias /var/www/nextcloud/fripost.ico;
+    }
 }
 
 server {
@@ -101,10 +100,10 @@ server {
 
     server_name www.cloud.fripost.org;
 
-    include snippets/acme-challenge.conf;
+    include /etc/lacme/nginx.conf;
 
-    access_log  /var/log/nginx/cloud.access.log;
-    error_log   /var/log/nginx/cloud.error.log info;
+    access_log /var/log/nginx/cloud.access.log;
+    error_log  /var/log/nginx/cloud.error.log info;
 
     location / {
         return 301 https://cloud.fripost.org$request_uri;