From e0e21acf73b0c43f042af2a40b3094cff8fab226 Mon Sep 17 00:00:00 2001
From: Wonderfall <wonderfall@schrodinger.io>
Date: Sun, 16 Oct 2016 14:03:42 +0200
Subject: [PATCH] nextcloud: use redis for file locking cache

---
 nextcloud/10.0-armhf/Dockerfile      |  9 ++++++---
 nextcloud/10.0-armhf/redis.conf      | 14 ++++++++++++++
 nextcloud/10.0-armhf/run.sh          |  3 ++-
 nextcloud/10.0-armhf/s6.d/redis/run  |  2 ++
 nextcloud/10.0-armhf/setup.sh        |  7 +++++++
 nextcloud/daily-armhf/Dockerfile     |  9 ++++++---
 nextcloud/daily-armhf/redis.conf     | 14 ++++++++++++++
 nextcloud/daily-armhf/s6.d/redis/run |  2 ++
 nextcloud/daily-armhf/setup.sh       | 10 +++++++---
 9 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 nextcloud/10.0-armhf/redis.conf
 create mode 100644 nextcloud/10.0-armhf/s6.d/redis/run
 create mode 100644 nextcloud/daily-armhf/redis.conf
 create mode 100644 nextcloud/daily-armhf/s6.d/redis/run

diff --git a/nextcloud/10.0-armhf/Dockerfile b/nextcloud/10.0-armhf/Dockerfile
index 40d6b56..7a43d7e 100644
--- a/nextcloud/10.0-armhf/Dockerfile
+++ b/nextcloud/10.0-armhf/Dockerfile
@@ -7,8 +7,9 @@ ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
     UPLOAD_MAX_SIZE=10G \
-    APC_SHM_SIZE=64M \
-    OPCACHE_MEM_SIZE=64 \
+    APC_SHM_SIZE=128M \
+    OPCACHE_MEM_SIZE=128 \
+    REDIS_MAX_MEMORY=64mb \
     CRON_PERIOD=15m \
     TZ=Etc/UTC \
     DB_TYPE=sqlite3 \
@@ -34,6 +35,7 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
     samba-client \
     su-exec \
     tzdata \
+    redis \
     php7@commuedge \
     php7-fpm@commuedge \
     php7-intl@commuedge \
@@ -98,6 +100,7 @@ COPY nginx.conf /etc/nginx/nginx.conf
 COPY php-fpm.conf /etc/php7/php-fpm.conf
 COPY opcache.ini /etc/php7/conf.d/00_opcache.ini
 COPY apcu.ini /etc/php7/conf.d/apcu.ini
+COPY redis.conf /etc/redis.conf
 COPY run.sh /usr/local/bin/run.sh
 COPY setup.sh /usr/local/bin/setup.sh
 COPY occ /usr/local/bin/occ
@@ -105,7 +108,7 @@ COPY s6.d /etc/s6.d
 
 RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
 
-VOLUME /data /config /apps2
+VOLUME /data /config /apps2 /var/lib/redis
 
 EXPOSE 8888
 
diff --git a/nextcloud/10.0-armhf/redis.conf b/nextcloud/10.0-armhf/redis.conf
new file mode 100644
index 0000000..c26fc6b
--- /dev/null
+++ b/nextcloud/10.0-armhf/redis.conf
@@ -0,0 +1,14 @@
+bind 127.0.0.1
+protected-mode yes
+port 0
+unixsocket /tmp/redis.sock
+unixsocketperm 700
+daemonize no
+pidfile /tmp/redis.pid
+logfile /tmp/redis.log
+save 900 1
+save 300 10
+save 60 10000
+dbfilename dump.rdb
+dir /var/lib/redis/
+maxmemory <REDIS_MAX_MEMORY>
diff --git a/nextcloud/10.0-armhf/run.sh b/nextcloud/10.0-armhf/run.sh
index 16b4785..2c2144f 100644
--- a/nextcloud/10.0-armhf/run.sh
+++ b/nextcloud/10.0-armhf/run.sh
@@ -3,13 +3,14 @@
 sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/php7/php-fpm.conf \
        -e "s/<APC_SHM_SIZE>/$APC_SHM_SIZE/g" /etc/php7/conf.d/apcu.ini \
        -e "s/<OPCACHE_MEM_SIZE>/$OPCACHE_MEM_SIZE/g" /etc/php7/conf.d/00_opcache.ini \
+       -e "s/<REDIS_MAX_MEMORY>/$REDIS_MAX_MEMORY/g" /etc/redis.conf \
        -e "s/<CRON_PERIOD>/$CRON_PERIOD/g" /etc/s6.d/cron/run
 
 # Put the configuration and apps into volumes
 ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null
 ln -sf /apps2 /nextcloud &>/dev/null
 
-chown -R $UID:$GID /nextcloud /data /config /apps2 /etc/nginx /etc/php7 /var/log /var/lib/nginx /tmp /etc/s6.d
+chown -R $UID:$GID /nextcloud /data /config /apps2 /etc/nginx /etc/php7 /var/log /var/lib/nginx /var/lib/redis /tmp /etc/s6.d
 
 if [ ! -f /config/config.php ]; then
     # New installation, run the setup
diff --git a/nextcloud/10.0-armhf/s6.d/redis/run b/nextcloud/10.0-armhf/s6.d/redis/run
new file mode 100644
index 0000000..4881331
--- /dev/null
+++ b/nextcloud/10.0-armhf/s6.d/redis/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec redis-server /etc/redis.conf
diff --git a/nextcloud/10.0-armhf/setup.sh b/nextcloud/10.0-armhf/setup.sh
index dd011cd..ab7eb5b 100755
--- a/nextcloud/10.0-armhf/setup.sh
+++ b/nextcloud/10.0-armhf/setup.sh
@@ -29,6 +29,13 @@ cat > $CONFIGFILE <<EOF;
 
   'memcache.local' => '\OC\Memcache\APCu',
 
+  'memcache.locking' => '\OC\Memcache\Redis',
+   'redis' => array(
+        'host' => '/tmp/redis.sock',
+        'port' => 0,
+        'timeout' => 0.0,
+         ),
+
   'instanceid' => '$instanceid',
 );
 ?>
diff --git a/nextcloud/daily-armhf/Dockerfile b/nextcloud/daily-armhf/Dockerfile
index 1feeb1b..ad06af0 100644
--- a/nextcloud/daily-armhf/Dockerfile
+++ b/nextcloud/daily-armhf/Dockerfile
@@ -5,8 +5,9 @@ ARG GNU_LIBICONV_VERSION=1.14
 
 ENV UID=991 GID=991 \
     UPLOAD_MAX_SIZE=10G \
-    APC_SHM_SIZE=64M \
-    OPCACHE_MEM_SIZE=64 \
+    APC_SHM_SIZE=128M \
+    OPCACHE_MEM_SIZE=128 \
+    REDIS_MAX_MEMORY=64mb \
     CRON_PERIOD=15m \
     TZ=Etc/UTC \
     DB_TYPE=sqlite3 \
@@ -31,6 +32,7 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
     samba-client \
     su-exec \
     tzdata \
+    redis \
     php7@commuedge \
     php7-fpm@commuedge \
     php7-intl@commuedge \
@@ -82,6 +84,7 @@ COPY nginx.conf /etc/nginx/nginx.conf
 COPY php-fpm.conf /etc/php7/php-fpm.conf
 COPY opcache.ini /etc/php7/conf.d/00_opcache.ini
 COPY apcu.ini /etc/php7/conf.d/apcu.ini
+COPY redis.conf /etc/redis.conf
 COPY run.sh /usr/local/bin/run.sh
 COPY setup.sh /usr/local/bin/setup.sh
 COPY occ /usr/local/bin/occ
@@ -89,7 +92,7 @@ COPY s6.d /etc/s6.d
 
 RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
 
-VOLUME /data /config /apps2
+VOLUME /data /config /apps2 /var/lib/redis
 
 EXPOSE 8888
 
diff --git a/nextcloud/daily-armhf/redis.conf b/nextcloud/daily-armhf/redis.conf
new file mode 100644
index 0000000..c26fc6b
--- /dev/null
+++ b/nextcloud/daily-armhf/redis.conf
@@ -0,0 +1,14 @@
+bind 127.0.0.1
+protected-mode yes
+port 0
+unixsocket /tmp/redis.sock
+unixsocketperm 700
+daemonize no
+pidfile /tmp/redis.pid
+logfile /tmp/redis.log
+save 900 1
+save 300 10
+save 60 10000
+dbfilename dump.rdb
+dir /var/lib/redis/
+maxmemory <REDIS_MAX_MEMORY>
diff --git a/nextcloud/daily-armhf/s6.d/redis/run b/nextcloud/daily-armhf/s6.d/redis/run
new file mode 100644
index 0000000..4881331
--- /dev/null
+++ b/nextcloud/daily-armhf/s6.d/redis/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec redis-server /etc/redis.conf
diff --git a/nextcloud/daily-armhf/setup.sh b/nextcloud/daily-armhf/setup.sh
index b6d9d92..ab7eb5b 100755
--- a/nextcloud/daily-armhf/setup.sh
+++ b/nextcloud/daily-armhf/setup.sh
@@ -29,6 +29,13 @@ cat > $CONFIGFILE <<EOF;
 
   'memcache.local' => '\OC\Memcache\APCu',
 
+  'memcache.locking' => '\OC\Memcache\Redis',
+   'redis' => array(
+        'host' => '/tmp/redis.sock',
+        'port' => 0,
+        'timeout' => 0.0,
+         ),
+
   'instanceid' => '$instanceid',
 );
 ?>
@@ -85,10 +92,7 @@ php7 <<EOF > $CONFIG_TEMP && mv $CONFIG_TEMP $CONFIGFILE
 <?php
 include("/config/config.php");
 
-\$CONFIG['trusted_domains'] = array('$VIRTUAL_HOST');
-
 //\$CONFIG['memcache.local'] = '\\OC\\Memcache\\Memcached';
-//\$CONFIG['overwrite.cli.url'] = '/cloud';
 \$CONFIG['mail_from_address'] = 'administrator'; # just the local part, matches our master administrator address
 
 \$CONFIG['logtimezone'] = '$TZ';