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"
}
