[diff] www/nextcloud: README root strip leftover

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

[diff] www/nextcloud: README root strip leftover

Clemens Goessnitzer
www/nextcloud still has "root strip 1" in README for httpd.conf example

Clemens

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

Reply | Threaded
Open this post in threaded view
|

Re: [diff] www/nextcloud: README root strip leftover

Klemens Nanni-2
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.

> --- 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.

Reply | Threaded
Open this post in threaded view
|

Re: [diff] www/nextcloud: README root strip leftover

Clemens Goessnitzer
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

nextcloud_diff.txt (1K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [diff] www/nextcloud: README root strip leftover

Klemens Nanni-2
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?

Reply | Threaded
Open this post in threaded view
|

Re: [diff] www/nextcloud: README root strip leftover

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


Reply | Threaded
Open this post in threaded view
|

Re: [diff] www/nextcloud: README root strip leftover

Gonzalo L. Rodriguez-2
In reply to this post by Clemens Goessnitzer
thanks, I have a similar diff on my tree waiting for the relase.

On [17/07/18] [07:27P], Clemens Gößnitzer wrote:

>www/nextcloud still has "root strip 1" in README for httpd.conf example
>
>Clemens
>
>--- 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"
>     }
>

--
Sending from my toaster.

Reply | Threaded
Open this post in threaded view
|

Re: [diff] www/nextcloud: README root strip leftover

Gonzalo L. Rodriguez-2
In reply to this post by Clemens Goessnitzer
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.

nextcloud.diff (3K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [diff] www/nextcloud: README root strip leftover

Gonzalo L. Rodriguez-2
In reply to this post by Clemens Goessnitzer
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.

nextcloud.diff (3K) Download Attachment
owncloud.diff (1K) Download Attachment