From 40212aaa24b8cc9947aa8f20a20e90a59a012121 Mon Sep 17 00:00:00 2001
From: Tilo Spannagel <development@tilosp.de>
Date: Sat, 1 Jul 2017 14:31:06 +0200
Subject: Move apps.config.php into config dir

---
 12.0/apache/Dockerfile             |  3 ++-
 12.0/apache/apps.config.php        | 15 ---------------
 12.0/apache/config/apps.config.php | 15 +++++++++++++++
 12.0/fpm/Dockerfile                |  3 ++-
 12.0/fpm/apps.config.php           | 15 ---------------
 12.0/fpm/config/apps.config.php    | 15 +++++++++++++++
 6 files changed, 34 insertions(+), 32 deletions(-)
 delete mode 100644 12.0/apache/apps.config.php
 create mode 100644 12.0/apache/config/apps.config.php
 delete mode 100644 12.0/fpm/apps.config.php
 create mode 100644 12.0/fpm/config/apps.config.php

(limited to '12.0')

diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile
index 1b05272b..1377017c 100644
--- a/12.0/apache/Dockerfile
+++ b/12.0/apache/Dockerfile
@@ -45,6 +45,8 @@ RUN a2enmod rewrite
 ENV NEXTCLOUD_VERSION 12.0.0
 VOLUME /var/www/html
 
+COPY config/* /usr/src/nextcloud/config/
+
 RUN curl -fsSL -o nextcloud.tar.bz2 \
     "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
  && curl -fsSL -o nextcloud.tar.bz2.asc \
@@ -70,7 +72,6 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
  && chmod +x /usr/src/nextcloud/occ
 
 COPY docker-entrypoint.sh /entrypoint.sh
-COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/12.0/apache/apps.config.php b/12.0/apache/apps.config.php
deleted file mode 100644
index a4bed833..00000000
--- a/12.0/apache/apps.config.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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/12.0/apache/config/apps.config.php b/12.0/apache/config/apps.config.php
new file mode 100644
index 00000000..a4bed833
--- /dev/null
+++ b/12.0/apache/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/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile
index 41b7365f..bcf3a3e4 100644
--- a/12.0/fpm/Dockerfile
+++ b/12.0/fpm/Dockerfile
@@ -43,6 +43,8 @@ RUN set -ex \
 ENV NEXTCLOUD_VERSION 12.0.0
 VOLUME /var/www/html
 
+COPY config/* /usr/src/nextcloud/config/
+
 RUN curl -fsSL -o nextcloud.tar.bz2 \
     "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
  && curl -fsSL -o nextcloud.tar.bz2.asc \
@@ -68,7 +70,6 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
  && chmod +x /usr/src/nextcloud/occ
 
 COPY docker-entrypoint.sh /entrypoint.sh
-COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/12.0/fpm/apps.config.php b/12.0/fpm/apps.config.php
deleted file mode 100644
index a4bed833..00000000
--- a/12.0/fpm/apps.config.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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/12.0/fpm/config/apps.config.php b/12.0/fpm/config/apps.config.php
new file mode 100644
index 00000000..a4bed833
--- /dev/null
+++ b/12.0/fpm/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,
+      ),
+  ),
+);
-- 
cgit v1.2.3