On [17/07/18] [09:03P], Clemens Gößnitzer wrote:
Am 2018-07-17 10:49, schrieb Klemens Nanni:
On Tue, Jul 17, 2018 at 09:27:43AM +0200, Clemens Gößnitzer wrote:
www/nextcloud still has "root strip 1" in README for httpd.conf example
Thanks. Since you are changing the package's content, do note that this
warrants a REVISION bump.

done.
--- ports/www/nextcloud/pkg/README.orig 2018-07-17 09:21:51.171310863 +0200 +++ ports/www/nextcloud/pkg/README 2018-07-17 09:22:21.211676159 +0200
@@ -62,7 +62,8 @@
    location "/console*"            { block }

    location "/*.php*" {
-        root { "/nextcloud", strip 1 }
+        root "/nextcloud"
+        request strip 1
        fastcgi socket "/run/php-fpm.sock"
    }
That turns it into the exact two lines which are used in the next
`location "/*"' block as well. Would it be worth to somehow combine
these? Just wondering.
done.

diff attached

What about this one attached.

--
Sending from my toaster.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/nextcloud/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile    19 Jun 2018 13:47:54 -0000      1.20
+++ Makefile    17 Jul 2018 10:38:41 -0000
@@ -5,7 +5,7 @@ COMMENT=                easy and universal access to s
 V=                     13.0.4
 DISTNAME=              nextcloud-${V}
 EXTRACT_SUFX=          .tar.bz2
-REVISION=              1
+REVISION=              2
 
 CATEGORIES=            www
 
Index: pkg/README
===================================================================
RCS file: /cvs/ports/www/nextcloud/pkg/README,v
retrieving revision 1.5
diff -u -p -r1.5 README
--- pkg/README  19 Jun 2018 13:47:54 -0000      1.5
+++ pkg/README  17 Jul 2018 10:38:42 -0000
@@ -32,44 +32,52 @@ httpd(8) example configuration for Nextc
 
 
---8<---------------------------------------------------------------------------
 server "domain.tld" {
-    listen on egress tls port 443
+       listen on * tls port 443
+       #listen on * port 80
+       alias "www.domain.tld"
 
-    tls {
-        certificate "/etc/ssl/domain.tld_fullchain.pem"
-        key "/etc/ssl/private/domain.tld_private.pem"
-    }
-
-    # First deny access to the specified files
-    location "/db_structure.xml"    { block }
-    location "/.ht*"                { block }
-    location "/README"              { block }
-    location "/data*"               { block }
-    location "/config*"             { block }
-    location "/build*"              { block }
-    location "/tests*"              { block }
-    location "/config*"             { block }
-    location "/lib*"                { block }
-    location "/3rdparty*"           { block }
-    location "/templates*"          { block }
-    location "/data*"               { block }
-    location "/.ht*"                { block }
-    location "/.user*"              { block }
-    location "/autotest*"           { block }
-    location "/occ*"                { block }
-    location "/issue*"              { block }
-    location "/indie*"              { block }
-    location "/db_*"                { block }
-    location "/console*"            { block }
-
-    location "/*.php*" {
-        root { "/nextcloud", strip 1 }
-        fastcgi socket "/run/php-fpm.sock"
-    }
-
-    location "/*" {
-        root "/nextcloud"
-        request strip 1
-    }
+       directory index "index.php"
+       root "/nextcloud"
+
+       hsts max-age 15768000
+
+       tls {
+               certificate "/etc/ssl/acme/domain.tld_fullchain.pem"
+               key "/etc/ssl/acme/private/domain.tld_privkey.pem"
+       }
+
+       tcp nodelay
+       connection { max requests 500, timeout 3600 }
+
+       # Set max upload size to 513M (in bytes)
+       # Your php.ini needs the same limits
+       connection max request body 513000000
+
+       # First deny access to the specified files
+       location "/db_structure.xml"            { block }
+       location "/.ht*"                        { block }
+       location "/README"                      { block }
+       location "/data*"                       { block }
+       location "/config*"                     { block }
+       location "/build*"                      { block }
+       location "/tests*"                      { block }
+       location "/config*"                     { block }
+       location "/lib*"                        { block }
+       location "/3rdparty*"                   { block }
+       location "/templates*"                  { block }
+       location "/data*"                       { block }
+       location "/.ht*"                        { block }
+       location "/.user*"                      { block }
+       location "/autotest*"                   { block }
+       location "/occ*"                        { block }
+       location "/issue*"                      { block }
+       location "/indie*"                      { block }
+       location "/db_*"                        { block }
+       location "/console*"                    { block }
+
+       location "/*.php*" {
+               fastcgi socket "/run/php-fpm.sock"
+       }
 }
 
---8<---------------------------------------------------------------------------
 

Reply via email to