From 3c4d76c76e6dc2af1e297c3306289bc404543fa3 Mon Sep 17 00:00:00 2001
From: Paul-Henri Froidmont <git.contact-57n2p@froidmont.org>
Date: Fri, 12 Jan 2018 01:37:27 +0100
Subject: [PATCH] Add missing files to Nextcloud config + some tweaks

---
 playbook.yml                                  |  2 +-
 .../files/nextcloud/app/Dockerfile            | 12 +++-
 .../files/nextcloud/app/supervisord.conf      | 23 ++++++++
 .../files/nextcloud/config/.htaccess          | 15 +++++
 .../files/nextcloud/config/apps.config.php    | 15 +++++
 .../{app => config}/redis.config.php          |  1 +
 .../files/nextcloud/docker-compose.yml        | 55 ++++++-------------
 .../files/nextcloud/web/nginx.conf            |  2 +-
 .../templates/nextcloud/config/config.php     | 16 ------
 9 files changed, 84 insertions(+), 57 deletions(-)
 create mode 100644 roles/nextcloud-docker/files/nextcloud/app/supervisord.conf
 create mode 100644 roles/nextcloud-docker/files/nextcloud/config/.htaccess
 create mode 100644 roles/nextcloud-docker/files/nextcloud/config/apps.config.php
 rename roles/nextcloud-docker/files/nextcloud/{app => config}/redis.config.php (76%)

diff --git a/playbook.yml b/playbook.yml
index 25a3e0e..3320a15 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -16,7 +16,7 @@
     - role: emby-docker
     - role: gitlab-docker
     - role: mailu-docker
-    - role: nextcloud-docker
+    - { role: nextcloud-docker, tags: [ 'nextcloud', 'docker' ] }
     - role: matrix-docker
     - role: plex-docker
     - role: deluge-docker
diff --git a/roles/nextcloud-docker/files/nextcloud/app/Dockerfile b/roles/nextcloud-docker/files/nextcloud/app/Dockerfile
index 4443ff4..335160f 100644
--- a/roles/nextcloud-docker/files/nextcloud/app/Dockerfile
+++ b/roles/nextcloud-docker/files/nextcloud/app/Dockerfile
@@ -1,4 +1,14 @@
 FROM nextcloud:fpm
 
-COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
+RUN apt-get update && apt-get install -y \
+  supervisor \
+  cron \
+  vim \
+  && rm -rf /var/lib/apt/lists/*
 
+RUN mkdir /var/log/supervisord /var/run/supervisord && \
+  echo "*/15 * * * * su - www-data -s /bin/bash -c \"php -f /var/www/html/cron.php\""| crontab -
+
+COPY supervisord.conf /etc/supervisor/supervisord.conf
+
+CMD ["/usr/bin/supervisord"]
diff --git a/roles/nextcloud-docker/files/nextcloud/app/supervisord.conf b/roles/nextcloud-docker/files/nextcloud/app/supervisord.conf
new file mode 100644
index 0000000..9114fc2
--- /dev/null
+++ b/roles/nextcloud-docker/files/nextcloud/app/supervisord.conf
@@ -0,0 +1,23 @@
+[supervisord]
+nodaemon=true
+logfile=/var/log/supervisord/supervisord.log
+pidfile=/var/run/supervisord/supervisord.pid
+childlogdir=/var/log/supervisord/
+logfile_maxbytes=50MB                           ; maximum size of logfile before rotation
+logfile_backups=10                              ; number of backed up logfiles
+loglevel=debug
+
+[program:php-fpm]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=php-fpm
+
+[program:cron]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=cron -f
+
diff --git a/roles/nextcloud-docker/files/nextcloud/config/.htaccess b/roles/nextcloud-docker/files/nextcloud/config/.htaccess
new file mode 100644
index 0000000..79e65ab
--- /dev/null
+++ b/roles/nextcloud-docker/files/nextcloud/config/.htaccess
@@ -0,0 +1,15 @@
+# line below if for Apache 2.4
+<ifModule mod_authz_core.c>
+Require all denied
+</ifModule>
+
+# line below if for Apache 2.2
+<ifModule !mod_authz_core.c>
+deny from all
+</ifModule>
+
+# section for Apache 2.2 and 2.4
+<ifModule mod_autoindex.c>
+IndexIgnore *
+</ifModule>
+
diff --git a/roles/nextcloud-docker/files/nextcloud/config/apps.config.php b/roles/nextcloud-docker/files/nextcloud/config/apps.config.php
new file mode 100644
index 0000000..a4bed83
--- /dev/null
+++ b/roles/nextcloud-docker/files/nextcloud/config/apps.config.php
@@ -0,0 +1,15 @@
+<?php
+$CONFIG = array (
+  "apps_paths" => array (
+      0 => array (
+              "path"     => OC::$SERVERROOT."/apps",
+              "url"      => "/apps",
+              "writable" => false,
+      ),
+      1 => array (
+              "path"     => OC::$SERVERROOT."/custom_apps",
+              "url"      => "/custom_apps",
+              "writable" => true,
+      ),
+  ),
+);
diff --git a/roles/nextcloud-docker/files/nextcloud/app/redis.config.php b/roles/nextcloud-docker/files/nextcloud/config/redis.config.php
similarity index 76%
rename from roles/nextcloud-docker/files/nextcloud/app/redis.config.php
rename to roles/nextcloud-docker/files/nextcloud/config/redis.config.php
index 2baa9d3..452dd9a 100644
--- a/roles/nextcloud-docker/files/nextcloud/app/redis.config.php
+++ b/roles/nextcloud-docker/files/nextcloud/config/redis.config.php
@@ -1,5 +1,6 @@
 <?php
 $CONFIG = array (
+  'memcache.local' => '\OC\Memcache\Redis',
   'memcache.locking' => '\OC\Memcache\Redis',
   'redis' => array(
     'host' => 'redis',
diff --git a/roles/nextcloud-docker/files/nextcloud/docker-compose.yml b/roles/nextcloud-docker/files/nextcloud/docker-compose.yml
index 46ec430..1386d83 100644
--- a/roles/nextcloud-docker/files/nextcloud/docker-compose.yml
+++ b/roles/nextcloud-docker/files/nextcloud/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       - VIRTUAL_PORT=80
     depends_on:
       - app
-      - collabora
+#      - collabora
     networks:
       - proxy-tier
       - default
@@ -26,8 +26,8 @@ services:
   app:
     build: ./app
     volumes:
-      - ./config/config.php:/var/www/html/config/config.php
       - /var/lib/nextcloud:/var/www/html
+      - ./config:/var/www/html/config
       - /media:/media
       - /etc/localtime:/etc/localtime:ro
     environment:
@@ -39,27 +39,6 @@ services:
       - redis
     restart: always
 
-  cron:
-    build: ./app
-    restart: always
-    volumes:
-      - /var/lib/nextcloud:/var/www/html
-    user: www-data
-    entrypoint: |
-      bash -c 'bash -s <<EOF
-        trap "break;exit" SIGHUP SIGINT SIGTERM
-        while [ ! -f /var/www/html/config/config.php ]; do
-          sleep 1
-        done
-        while true; do
-          php -f /var/www/html/cron.php
-          sleep 15m
-        done
-      EOF'
-    depends_on:
-      - db
-      - redis
-
   db:
     image: mariadb
     volumes:
@@ -79,21 +58,21 @@ services:
     image: redis
     restart: always
 
-  collabora:
-    image: collabora/code
-    cap_add:
-      - MKNOD
-    expose:
-      - 9980
-    environment:
-      - domain=${CLOUD_DOMAIN}
-      - VIRTUAL_HOST=${COLLABORA_DOMAIN}
-      - VIRTUAL_NETWORK=nginx-proxy
-      - VIRTUAL_PORT=9980
+#  collabora:
+#    image: collabora/code
+#    cap_add:
+#      - MKNOD
+#    expose:
+#      - 9980
+#    environment:
+#      - domain=${CLOUD_DOMAIN}
+#      - VIRTUAL_HOST=${COLLABORA_DOMAIN}
+#      - VIRTUAL_NETWORK=nginx-proxy
+#      - VIRTUAL_PORT=9980
     #  - VIRTUAL_PROTO=https
 #      - LETSENCRYPT_HOST=${COLLABORA_DOMAIN}
 #      - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
-    networks:
-      - proxy-tier
-      - default
-    restart: always
+#    networks:
+#      - proxy-tier
+#      - default
+#    restart: always
diff --git a/roles/nextcloud-docker/files/nextcloud/web/nginx.conf b/roles/nextcloud-docker/files/nextcloud/web/nginx.conf
index bc4f915..38eef81 100644
--- a/roles/nextcloud-docker/files/nextcloud/web/nginx.conf
+++ b/roles/nextcloud-docker/files/nextcloud/web/nginx.conf
@@ -104,7 +104,7 @@ http {
             include fastcgi_params;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             fastcgi_param PATH_INFO $fastcgi_path_info;
-            # fastcgi_param HTTPS on;
+            fastcgi_param HTTPS on;
             #Avoid sending the security headers twice
             fastcgi_param modHeadersAvailable true;
             fastcgi_param front_controller_active true;
diff --git a/roles/nextcloud-docker/templates/nextcloud/config/config.php b/roles/nextcloud-docker/templates/nextcloud/config/config.php
index bf59ade..4edc57f 100644
--- a/roles/nextcloud-docker/templates/nextcloud/config/config.php
+++ b/roles/nextcloud-docker/templates/nextcloud/config/config.php
@@ -19,23 +19,7 @@ $CONFIG = array (
   'dbuser' => 'nextcloud',
   'dbpassword' => '{{nextcloud_mysql_password}}',
   'installed' => true,
-  'memcache.local' => '\\OC\\Memcache\\APCu',
   'htaccess.RewriteBase' => '/',
-  'apps_paths' => 
-  array (
-    0 => 
-    array (
-      'path' => '/var/www/html/apps',
-      'url' => '/apps',
-      'writable' => false,
-    ),
-    1 => 
-    array (
-      'path' => '/var/www/html/custom_apps',
-      'url' => '/custom_apps',
-      'writable' => true,
-    ),
-  ),
   'maintenance' => false,
   'updater.release.channel' => 'stable',
   'loglevel' => '1',