On [17/07/18] [09:41P], Clemens Gößnitzer wrote:
Am 2018-07-17 11:21, schrieb Klemens Nanni:
On Tue, Jul 17, 2018 at 11:03:27AM +0200, Clemens Gößnitzer wrote:
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
Please send diffs inline instead of attaching them.
--- ports/www/nextcloud/pkg/README.orig 2018-07-17
09:21:51.171310863 +0200
+++ ports/www/nextcloud/pkg/README 2018-07-17 10:54:36.180614774 +0200
@@ -34,6 +34,9 @@
server "domain.tld" {
listen on egress tls port 443
+ root "/nextcloud"
+ request strip 1
+
tls {
certificate "/etc/ssl/domain.tld_fullchain.pem"
key "/etc/ssl/private/domain.tld_private.pem"
@@ -62,14 +65,8 @@
location "/console*" { block }
location "/*.php*" {
- root { "/nextcloud", strip 1 }
fastcgi socket "/run/php-fpm.sock"
}
-
- location "/*" {
- root "/nextcloud"
- request strip 1
- }
}
You now moved this above `location "/console*"', did you confirm this
path still works and is not stripped with that configuration?
I can't confirm on -current, I only have -stable servers at hand, and
the
'location "foo" { block }' directives still work when moving "root
strip 1" to
the top of the server definition on -stable. Maybe someone with a
-current
system can confirm that this does not break the '{ block }' directives?
Or we just correct the root -> request issue for now:
--- ports/www/nextcloud/Makefile.orig 2018-07-17 10:55:01.400888144
+0200
+++ ports/www/nextcloud/Makefile 2018-07-17 10:55:06.880947541
+0200
@@ -5,7 +5,7 @@
V= 13.0.4
DISTNAME= nextcloud-${V}
EXTRACT_SUFX= .tar.bz2
-REVISION= 1
+REVISION= 2
CATEGORIES= www
--- ports/www/nextcloud/pkg/README.orig 2018-07-17 09:21:51.171310863
+0200
+++ ports/www/nextcloud/pkg/README 2018-07-17 11:38:54.317266559
+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"
}
Better and less complex diff for Nextcloud, while here, also fix for Owncloud.
--
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 13:14:12 -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 13:14:14 -0000
@@ -32,44 +32,49 @@ 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"
+ request strip 1
+
+ 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 }
+
+ # 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<---------------------------------------------------------------------------
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/owncloud/Makefile,v
retrieving revision 1.132
diff -u -p -r1.132 Makefile
--- Makefile 16 Jun 2018 08:29:44 -0000 1.132
+++ Makefile 17 Jul 2018 13:15:47 -0000
@@ -6,7 +6,7 @@ V= 10.0.8
DISTNAME= owncloud-${V}
EXTRACT_SUFX= .tar.bz2
-REVISION= 7
+REVISION= 8
CATEGORIES= www
Index: pkg/README
===================================================================
RCS file: /cvs/ports/www/owncloud/pkg/README,v
retrieving revision 1.52
diff -u -p -r1.52 README
--- pkg/README 16 Jun 2018 08:26:52 -0000 1.52
+++ pkg/README 17 Jul 2018 13:15:48 -0000
@@ -23,6 +23,10 @@ httpd(8) example configuration for ownCl
server "domain.tld" {
listen on egress tls port 443
+ directory index "index.php"
+ root "/owncloud"
+ request strip 1
+
tls {
certificate "/etc/ssl/domain.tld_fullchain.pem"
key "/etc/ssl/private/domain.tld_private.pem"
@@ -56,9 +60,8 @@ server "domain.tld" {
fastcgi socket "/run/php-fpm.sock"
}
- location "/*" {
- root "/owncloud"
- request strip 1
+ location "/*.php*" {
+ fastcgi socket "/run/php-fpm.sock"
}
}
---8<---------------------------------------------------------------------------
