From add34f5a38be1971e93b139b1d8dcfe717b497db Mon Sep 17 00:00:00 2001
From: Wonderfall <wonderfall@targaryen.house>
Date: Mon, 27 Jan 2020 14:29:39 +0100
Subject: [PATCH] imagick ext

---
 Dockerfile.18.0                       | 4 ++++
 rootfs/nginx/sites-enabled/nginx.conf | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.18.0 b/Dockerfile.18.0
index c86cd1e..5439b02 100644
--- a/Dockerfile.18.0
+++ b/Dockerfile.18.0
@@ -24,17 +24,21 @@ RUN apk -U upgrade \
     pcre-dev \
     libtool \
     samba-dev \
+    imagemagick-dev \
  && apk add \
     libressl \
     ca-certificates \
     libsmbclient \
     tzdata \
+    imagemagick \
  && pecl install \
     smbclient \
     apcu \
     redis \
+    imagick \
  && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
  && echo "extension=redis.so" > /php/conf.d/redis.ini \
+ && echo "extension=imagick.so" > /php/conf.d/imagick.ini \
  && mkdir /nextcloud \
  && cd /tmp \
  && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
diff --git a/rootfs/nginx/sites-enabled/nginx.conf b/rootfs/nginx/sites-enabled/nginx.conf
index cf2f663..0a93b49 100644
--- a/rootfs/nginx/sites-enabled/nginx.conf
+++ b/rootfs/nginx/sites-enabled/nginx.conf
@@ -22,11 +22,11 @@ server {
         }
 
         location = /.well-known/carddav {
-            return 301 $scheme://$host/remote.php/dav;
+            return 301 $scheme://$host:$server_port/remote.php/dav;
         }
-
+    
         location = /.well-known/caldav {
-            return 301 $scheme://$host/remote.php/dav;
+            return 301 $scheme://$host:$server_port/remote.php/dav;
         }
 
         location / {