What about this one? All happy?
OK?
Cheers.-
On Sat, 18 May 2019 at 11:41:58 -0400, Stefan Sperling wrote:
> On Sat, May 18, 2019 at 10:07:44AM +0200, Gonzalo L. Rodriguez wrote:
> > A diff would be nice, I like a simpler version of httpd.conf.
>
> Is this OK?
>
> diff 280bf952361344623a0efd16a764d42cf5d7a8b9 /usr/ports
> blob - 03857e21f187289323ca086848538a0ab24d2cfe
> file + www/nextcloud/Makefile
> --- www/nextcloud/Makefile
> +++ www/nextcloud/Makefile
> @@ -5,6 +5,7 @@ COMMENT= easy and universal access to shared
> and/or p
> V= 16.0.0
> DISTNAME= nextcloud-${V}
> EXTRACT_SUFX= .tar.bz2
> +REVISION= 0
>
> CATEGORIES= www
>
> blob - ef8c31fac5a80c2878b486f1472ac53152e7119b
> file + www/nextcloud/pkg/README
> --- www/nextcloud/pkg/README
> +++ www/nextcloud/pkg/README
> @@ -38,9 +38,6 @@ httpd(8) example configuration for Nextcloud:
> server "domain.tld" {
> listen on egress tls port 443
>
> - root "/nextcloud"
> - request strip 1
> -
> hsts max-age 15768000
>
> tls {
> @@ -48,28 +45,54 @@ server "domain.tld" {
> key "/etc/ssl/private/domain.tld_private.pem"
> }
>
> - # First deny access to the specified files
> - location "/.ht*" { block }
> - location "/.user*" { block }
> - location "/3rdparty*" { block }
> - location "/README" { block }
> - location "/autotest*" { block }
> - location "/build*" { block }
> - location "/config*" { block }
> - location "/console*" { block }
> - location "/data*" { block }
> - location "/db_*" { block }
> - location "/indie*" { block }
> - location "/issue*" { block }
> - location "/lib*" { block }
> - location "/occ*" { block }
> - location "/templates*" { block }
> - location "/tests*" { block }
> + # Set max upload size to 513M (in bytes)
> + connection max request body 537919488
> + connection max requests 1000
> + connection request timeout 3600
> + connection timeout 3600
>
> - location "/*.php*" {
> + block drop
> +
> + # Ensure that no '*.php*' files can be fetched from these directories
> + location "/nextcloud/config/*" {
> + block drop
> + }
> + location "/nextcloud/data/*" {
> + block drop
> + }
> +
> + # Note that this matches "*.php*" anywhere in the request path.
> + location "/nextcloud/*.php*" {
> root "/nextcloud"
> request strip 1
> fastcgi socket "/run/php-fpm.sock"
> + pass
> + }
> +
> + location "/nextcloud/apps/*" {
> + root "/nextcloud"
> + request strip 1
> + pass
> + }
> +
> + location "/nextcloud/core/*" {
> + root "/nextcloud"
> + request strip 1
> + pass
> + }
> +
> + location "/nextcloud/settings/*" {
> + root "/nextcloud"
> + request strip 1
> + pass
> + }
> +
> + location "/nextcloud" {
> + block return 301 "$DOCUMENT_URI/index.php"
> + }
> +
> + location "/nextcloud/" {
> + block return 301 "$DOCUMENT_URI/index.php"
> }
> }
>
> ---8<---------------------------------------------------------------------------
--
- gonzalo
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/nextcloud/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile 29 Apr 2019 11:52:20 -0000 1.38
+++ Makefile 19 May 2019 08:36:56 -0000
@@ -2,7 +2,7 @@
COMMENT= easy and universal access to shared and/or personal
files
-V= 16.0.0
+V= 16.0.1
DISTNAME= nextcloud-${V}
EXTRACT_SUFX= .tar.bz2
@@ -56,6 +56,9 @@ RUN_DEPENDS += lang/php/${MODPHP_VERSIO
# distributed caching and Transactional File Locking
RUN_DEPENDS += databases/pecl-redis${MODPHP_FLAVOR}
+
+# image processing
+RUN_DEPENDS += graphics/pecl-imagick${MODPHP_FLAVOR}
do-install:
cp -Rp ${WRKSRC} ${INSTDIR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/nextcloud/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo 29 Apr 2019 11:52:20 -0000 1.24
+++ distinfo 19 May 2019 08:36:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (nextcloud-16.0.0.tar.bz2) =
RTL3Aosdm/Bg91rE+73lKlns2ckVXzF4oDjTzzYJQC4=
-SIZE (nextcloud-16.0.0.tar.bz2) = 61731904
+SHA256 (nextcloud-16.0.1.tar.bz2) =
qAzlhunpMLL7ppcHMR5XU0bNTcRALoRnjHMPmTDXiu4=
+SIZE (nextcloud-16.0.1.tar.bz2) = 102865395
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v
retrieving revision 1.27
diff -u -p -r1.27 PLIST
--- pkg/PLIST 29 Apr 2019 11:52:20 -0000 1.27
+++ pkg/PLIST 19 May 2019 08:36:57 -0000
@@ -5026,10 +5026,14 @@ nextcloud/apps/accessibility/l10n/de_DE.
nextcloud/apps/accessibility/l10n/de_DE.json
nextcloud/apps/accessibility/l10n/el.js
nextcloud/apps/accessibility/l10n/el.json
+nextcloud/apps/accessibility/l10n/eo.js
+nextcloud/apps/accessibility/l10n/eo.json
nextcloud/apps/accessibility/l10n/es.js
nextcloud/apps/accessibility/l10n/es.json
nextcloud/apps/accessibility/l10n/es_AR.js
nextcloud/apps/accessibility/l10n/es_AR.json
+nextcloud/apps/accessibility/l10n/eu.js
+nextcloud/apps/accessibility/l10n/eu.json
nextcloud/apps/accessibility/l10n/fi.js
nextcloud/apps/accessibility/l10n/fi.json
nextcloud/apps/accessibility/l10n/fo.js
@@ -5050,18 +5054,30 @@ nextcloud/apps/accessibility/l10n/ja.js
nextcloud/apps/accessibility/l10n/ja.json
nextcloud/apps/accessibility/l10n/ko.js
nextcloud/apps/accessibility/l10n/ko.json
+nextcloud/apps/accessibility/l10n/lt_LT.js
+nextcloud/apps/accessibility/l10n/lt_LT.json
+nextcloud/apps/accessibility/l10n/mk.js
+nextcloud/apps/accessibility/l10n/mk.json
nextcloud/apps/accessibility/l10n/nl.js
nextcloud/apps/accessibility/l10n/nl.json
+nextcloud/apps/accessibility/l10n/nn_NO.js
+nextcloud/apps/accessibility/l10n/nn_NO.json
nextcloud/apps/accessibility/l10n/pl.js
nextcloud/apps/accessibility/l10n/pl.json
nextcloud/apps/accessibility/l10n/pt_BR.js
nextcloud/apps/accessibility/l10n/pt_BR.json
nextcloud/apps/accessibility/l10n/pt_PT.js
nextcloud/apps/accessibility/l10n/pt_PT.json
+nextcloud/apps/accessibility/l10n/ro.js
+nextcloud/apps/accessibility/l10n/ro.json
nextcloud/apps/accessibility/l10n/ru.js
nextcloud/apps/accessibility/l10n/ru.json
nextcloud/apps/accessibility/l10n/sk.js
nextcloud/apps/accessibility/l10n/sk.json
+nextcloud/apps/accessibility/l10n/sl.js
+nextcloud/apps/accessibility/l10n/sl.json
+nextcloud/apps/accessibility/l10n/sq.js
+nextcloud/apps/accessibility/l10n/sq.json
nextcloud/apps/accessibility/l10n/sr.js
nextcloud/apps/accessibility/l10n/sr.json
nextcloud/apps/accessibility/l10n/sv.js
@@ -8094,6 +8110,8 @@ nextcloud/apps/files_rightclick/l10n/ru.
nextcloud/apps/files_rightclick/l10n/ru.json
nextcloud/apps/files_rightclick/l10n/sk.js
nextcloud/apps/files_rightclick/l10n/sk.json
+nextcloud/apps/files_rightclick/l10n/sl.js
+nextcloud/apps/files_rightclick/l10n/sl.json
nextcloud/apps/files_rightclick/l10n/sr.js
nextcloud/apps/files_rightclick/l10n/sr.json
nextcloud/apps/files_rightclick/l10n/sv.js
@@ -9228,9 +9246,13 @@ nextcloud/apps/firstrunwizard/js/firstru
nextcloud/apps/firstrunwizard/js/firstrunwizard.js.map
nextcloud/apps/firstrunwizard/js/personalsettings.js
nextcloud/apps/firstrunwizard/l10n/
+nextcloud/apps/firstrunwizard/l10n/ar.js
+nextcloud/apps/firstrunwizard/l10n/ar.json
nextcloud/apps/firstrunwizard/l10n/bg.js
nextcloud/apps/firstrunwizard/l10n/bg.json
nextcloud/apps/firstrunwizard/l10n/bn_IN.php
+nextcloud/apps/firstrunwizard/l10n/ca.js
+nextcloud/apps/firstrunwizard/l10n/ca.json
nextcloud/apps/firstrunwizard/l10n/cs.js
nextcloud/apps/firstrunwizard/l10n/cs.json
nextcloud/apps/firstrunwizard/l10n/cy_GB.php
@@ -10602,6 +10624,8 @@ nextcloud/apps/privacy/js/
nextcloud/apps/privacy/js/script.js
nextcloud/apps/privacy/js/script.js.map
nextcloud/apps/privacy/l10n/
+nextcloud/apps/privacy/l10n/af.js
+nextcloud/apps/privacy/l10n/af.json
nextcloud/apps/privacy/l10n/bg.js
nextcloud/apps/privacy/l10n/bg.json
nextcloud/apps/privacy/l10n/ca.js
@@ -10612,6 +10636,8 @@ nextcloud/apps/privacy/l10n/de.js
nextcloud/apps/privacy/l10n/de.json
nextcloud/apps/privacy/l10n/de_DE.js
nextcloud/apps/privacy/l10n/de_DE.json
+nextcloud/apps/privacy/l10n/eo.js
+nextcloud/apps/privacy/l10n/eo.json
nextcloud/apps/privacy/l10n/es.js
nextcloud/apps/privacy/l10n/es.json
nextcloud/apps/privacy/l10n/eu.js
@@ -10626,6 +10652,8 @@ nextcloud/apps/privacy/l10n/is.js
nextcloud/apps/privacy/l10n/is.json
nextcloud/apps/privacy/l10n/it.js
nextcloud/apps/privacy/l10n/it.json
+nextcloud/apps/privacy/l10n/ja.js
+nextcloud/apps/privacy/l10n/ja.json
nextcloud/apps/privacy/l10n/lt_LT.js
nextcloud/apps/privacy/l10n/lt_LT.json
nextcloud/apps/privacy/l10n/nl.js
@@ -10744,6 +10772,8 @@ nextcloud/apps/recommendations/l10n/pl.j
nextcloud/apps/recommendations/l10n/pl.json
nextcloud/apps/recommendations/l10n/pt_BR.js
nextcloud/apps/recommendations/l10n/pt_BR.json
+nextcloud/apps/recommendations/l10n/ru.js
+nextcloud/apps/recommendations/l10n/ru.json
nextcloud/apps/recommendations/l10n/sk.js
nextcloud/apps/recommendations/l10n/sk.json
nextcloud/apps/recommendations/l10n/sr.js
@@ -10791,8 +10821,6 @@ nextcloud/apps/serverinfo/js/Chart.min.j
nextcloud/apps/serverinfo/js/script.js
nextcloud/apps/serverinfo/js/smoothie.js
nextcloud/apps/serverinfo/l10n/
-nextcloud/apps/serverinfo/l10n/af.js
-nextcloud/apps/serverinfo/l10n/af.json
nextcloud/apps/serverinfo/l10n/ar.js
nextcloud/apps/serverinfo/l10n/ar.json
nextcloud/apps/serverinfo/l10n/ast.js
@@ -10813,6 +10841,8 @@ nextcloud/apps/serverinfo/l10n/el.js
nextcloud/apps/serverinfo/l10n/el.json
nextcloud/apps/serverinfo/l10n/en_GB.js
nextcloud/apps/serverinfo/l10n/en_GB.json
+nextcloud/apps/serverinfo/l10n/eo.js
+nextcloud/apps/serverinfo/l10n/eo.json
nextcloud/apps/serverinfo/l10n/es.js
nextcloud/apps/serverinfo/l10n/es.json
nextcloud/apps/serverinfo/l10n/es_419.js
@@ -11178,6 +11208,8 @@ nextcloud/apps/support/lib/Service/Subsc
nextcloud/apps/support/lib/Settings/
nextcloud/apps/support/lib/Settings/Admin.php
nextcloud/apps/support/lib/Settings/Section.php
+nextcloud/apps/support/lib/Subscription/
+nextcloud/apps/support/lib/Subscription/SubscriptionAdapter.php
nextcloud/apps/support/resources/
nextcloud/apps/support/resources/Why the Nextcloud Subscription.pdf
nextcloud/apps/support/templates/
@@ -12507,6 +12539,44 @@ nextcloud/apps/viewer/appinfo/
nextcloud/apps/viewer/appinfo/app.php
nextcloud/apps/viewer/appinfo/info.xml
nextcloud/apps/viewer/appinfo/signature.json
+nextcloud/apps/viewer/cypress/
+nextcloud/apps/viewer/cypress.json
+nextcloud/apps/viewer/cypress/fixtures/
+nextcloud/apps/viewer/cypress/fixtures/image-small.png
+nextcloud/apps/viewer/cypress/fixtures/image.bmp
+nextcloud/apps/viewer/cypress/fixtures/image.gif
+nextcloud/apps/viewer/cypress/fixtures/image.png
+nextcloud/apps/viewer/cypress/fixtures/image.svg
+nextcloud/apps/viewer/cypress/fixtures/image1.jpg
+nextcloud/apps/viewer/cypress/fixtures/image2.jpg
+nextcloud/apps/viewer/cypress/fixtures/image3.jpg
+nextcloud/apps/viewer/cypress/fixtures/image4.jpg
+nextcloud/apps/viewer/cypress/fixtures/video.mkv
+nextcloud/apps/viewer/cypress/fixtures/video.ogv
+nextcloud/apps/viewer/cypress/fixtures/video.webm
+nextcloud/apps/viewer/cypress/fixtures/video1.mp4
+nextcloud/apps/viewer/cypress/fixtures/video2.mp4
+nextcloud/apps/viewer/cypress/integration/
+nextcloud/apps/viewer/cypress/integration/files.spec.js
+nextcloud/apps/viewer/cypress/integration/image-small.png.spec.js
+nextcloud/apps/viewer/cypress/integration/image.gif.spec.js
+nextcloud/apps/viewer/cypress/integration/image.png.spec.js
+nextcloud/apps/viewer/cypress/integration/image.svg.spec.js
+nextcloud/apps/viewer/cypress/integration/images.spec.js
+nextcloud/apps/viewer/cypress/integration/video.mkv.spec.js
+nextcloud/apps/viewer/cypress/integration/video.mp4.spec.js
+nextcloud/apps/viewer/cypress/integration/video.ogv.spec.js
+nextcloud/apps/viewer/cypress/integration/video.webm.spec.js
+nextcloud/apps/viewer/cypress/integration/videos.spec.js
+nextcloud/apps/viewer/cypress/plugins/
+nextcloud/apps/viewer/cypress/plugins/index.js
+nextcloud/apps/viewer/cypress/start.sh
+nextcloud/apps/viewer/cypress/stop.sh
+nextcloud/apps/viewer/cypress/support/
+nextcloud/apps/viewer/cypress/support/commands.js
+nextcloud/apps/viewer/cypress/support/index.js
+nextcloud/apps/viewer/cypress/utils/
+nextcloud/apps/viewer/cypress/utils/index.js
nextcloud/apps/viewer/img/
nextcloud/apps/viewer/img/app.svg
nextcloud/apps/viewer/js/
@@ -12555,6 +12625,10 @@ nextcloud/apps/viewer/l10n/pt_BR.js
nextcloud/apps/viewer/l10n/pt_BR.json
nextcloud/apps/viewer/l10n/pt_PT.js
nextcloud/apps/viewer/l10n/pt_PT.json
+nextcloud/apps/viewer/l10n/ru.js
+nextcloud/apps/viewer/l10n/ru.json
+nextcloud/apps/viewer/l10n/sl.js
+nextcloud/apps/viewer/l10n/sl.json
nextcloud/apps/viewer/l10n/sq.js
nextcloud/apps/viewer/l10n/sq.json
nextcloud/apps/viewer/l10n/sr.js
@@ -12748,8 +12822,8 @@ nextcloud/config/
@mode 0640
@owner www
@group www
-nextcloud/config/CAN_INSTALL
nextcloud/config/.htaccess
+nextcloud/config/CAN_INSTALL
nextcloud/config/config.php.dist
@sample nextcloud/config/config.php
nextcloud/config/config.sample.php
@@ -12918,6 +12992,8 @@ nextcloud/core/Migrations/Version15000Da
nextcloud/core/Migrations/Version15000Date20181029084625.php
nextcloud/core/Migrations/Version16000Date20190207141427.php
nextcloud/core/Migrations/Version16000Date20190212081545.php
+nextcloud/core/Migrations/Version16000Date20190427105638.php
+nextcloud/core/Migrations/Version16000Date20190428150708.php
nextcloud/core/Notification/
nextcloud/core/Notification/RemoveLinkSharesNotifier.php
nextcloud/core/Service/
@@ -14977,6 +15053,8 @@ nextcloud/lib/private/SubAdmin.php
nextcloud/lib/private/Support/
nextcloud/lib/private/Support/CrashReport/
nextcloud/lib/private/Support/CrashReport/Registry.php
+nextcloud/lib/private/Support/Subscription/
+nextcloud/lib/private/Support/Subscription/Registry.php
nextcloud/lib/private/SystemConfig.php
nextcloud/lib/private/SystemTag/
nextcloud/lib/private/SystemTag/ManagerFactory.php
@@ -15504,6 +15582,12 @@ nextcloud/lib/public/Support/CrashReport
nextcloud/lib/public/Support/CrashReport/ICollectBreadcrumbs.php
nextcloud/lib/public/Support/CrashReport/IRegistry.php
nextcloud/lib/public/Support/CrashReport/IReporter.php
+nextcloud/lib/public/Support/Subscription/
+nextcloud/lib/public/Support/Subscription/Exception/
+nextcloud/lib/public/Support/Subscription/Exception/AlreadyRegisteredException.php
+nextcloud/lib/public/Support/Subscription/IRegistry.php
+nextcloud/lib/public/Support/Subscription/ISubscription.php
+nextcloud/lib/public/Support/Subscription/ISupportedApps.php
nextcloud/lib/public/SystemTag/
nextcloud/lib/public/SystemTag/ISystemTag.php
nextcloud/lib/public/SystemTag/ISystemTagManager.php
@@ -15740,6 +15824,8 @@ nextcloud/settings/l10n/pt_BR.js
nextcloud/settings/l10n/pt_BR.json
nextcloud/settings/l10n/pt_PT.js
nextcloud/settings/l10n/pt_PT.json
+nextcloud/settings/l10n/ro.js
+nextcloud/settings/l10n/ro.json
nextcloud/settings/l10n/ru.js
nextcloud/settings/l10n/ru.json
nextcloud/settings/l10n/sk.js
Index: pkg/README
===================================================================
RCS file: /cvs/ports/www/nextcloud/pkg/README,v
retrieving revision 1.12
diff -u -p -r1.12 README
--- pkg/README 11 Mar 2019 15:43:46 -0000 1.12
+++ pkg/README 19 May 2019 08:36:57 -0000
@@ -28,7 +28,7 @@ The HTTP server must be able to resolve
The configuration of an SQLite database path is set relatively to the chroot in
Nextcloud which will break background jobs run by cron(8) (see below).
A symlink can be created to workaround this issue:
- # ln -f ${INSTDIR} /nextcloud
+ # ln -sf ${INSTDIR} /nextcloud
OpenBSD HTTP daemon
-------------------
@@ -38,9 +38,6 @@ httpd(8) example configuration for Nextc
server "domain.tld" {
listen on egress tls port 443
- root "/nextcloud"
- request strip 1
-
hsts max-age 15768000
tls {
@@ -48,28 +45,55 @@ server "domain.tld" {
key "/etc/ssl/private/domain.tld_private.pem"
}
- # First deny access to the specified files
- location "/.ht*" { block }
- location "/.user*" { block }
- location "/3rdparty*" { block }
- location "/README" { block }
- location "/autotest*" { block }
- location "/build*" { block }
- location "/config*" { block }
- location "/console*" { block }
- location "/data*" { block }
- location "/db_*" { block }
- location "/indie*" { block }
- location "/issue*" { block }
- location "/lib*" { block }
- location "/occ*" { block }
- location "/templates*" { block }
- location "/tests*" { block }
+ # Set max upload size to 513M (in bytes)
+ connection max request body 537919488
+ connection max requests 1000
+ connection request timeout 3600
+ connection timeout 3600
+
+ block drop
+
+ # Ensure that no '*.php*' files can be fetched from these directories
+ location "/nextcloud/config/*" {
+ block drop
+ }
- location "/*.php*" {
+ location "/nextcloud/data/*" {
+ block drop
+ }
+
+ # Note that this matches "*.php*" anywhere in the request path.
+ location "/nextcloud/*.php*" {
root "/nextcloud"
request strip 1
fastcgi socket "/run/php-fpm.sock"
+ pass
+ }
+
+ location "/nextcloud/apps/*" {
+ root "/nextcloud"
+ request strip 1
+ pass
+ }
+
+ location "/nextcloud/core/*" {
+ root "/nextcloud"
+ request strip 1
+ pass
+ }
+
+ location "/nextcloud/settings/*" {
+ root "/nextcloud"
+ request strip 1
+ pass
+ }
+
+ location "/nextcloud" {
+ block return 301 "$DOCUMENT_URI/index.php"
+ }
+
+ location "/nextcloud/" {
+ block return 301 "$DOCUMENT_URI/index.php"
}
}
---8<---------------------------------------------------------------------------
