From d87b840646635ba5b8fb92f19f72fe9e6486251e Mon Sep 17 00:00:00 2001
From: Tilo Spannagel <development@tilosp.de>
Date: Tue, 29 Aug 2017 11:54:54 +0200
Subject: [PATCH] Add data directory default

---
 .config/autoconfig.php            | 23 ++++++++++++++---------
 11.0/apache/config/autoconfig.php | 23 ++++++++++++++---------
 11.0/fpm/config/autoconfig.php    | 23 ++++++++++++++---------
 12.0/apache/config/autoconfig.php | 23 ++++++++++++++---------
 12.0/fpm/config/autoconfig.php    | 23 ++++++++++++++---------
 5 files changed, 70 insertions(+), 45 deletions(-)

diff --git a/.config/autoconfig.php b/.config/autoconfig.php
index 7ff1d3e..b759f4d 100644
--- a/.config/autoconfig.php
+++ b/.config/autoconfig.php
@@ -1,29 +1,34 @@
 <?php
+
+$autoconfig_enabled = false;
+
 if (getenv('SQLITE_DATABASE')) {
     $AUTOCONFIG["dbtype"] = "sqlite";
     $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
-    $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
+    $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
     $AUTOCONFIG["dbtype"] = "mysql";
     $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
     $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
     $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
     $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
-    $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
+    $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
     $AUTOCONFIG["dbtype"] = "pgsql";
     $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
     $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
     $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
     $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $autoconfig_enabled = true;
+}
+
+if ($autoconfig_enabled) {
     $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
-}
 
-if (getenv('NEXTCLOUD_DATA_DIR')) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR');
-}
+    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
 
-if (getenv('NEXTCLOUD_ADMIN_USER') && getenv('NEXTCLOUD_ADMIN_PASSWORD')) {
-    $AUTOCONFIG["adminlogin"] = getenv('NEXTCLOUD_ADMIN_USER');
-    $AUTOCONFIG["adminpass"] = getenv('NEXTCLOUD_ADMIN_PASSWORD');
+    if (getenv('NEXTCLOUD_ADMIN_USER') && getenv('NEXTCLOUD_ADMIN_PASSWORD')) {
+        $AUTOCONFIG["adminlogin"] = getenv('NEXTCLOUD_ADMIN_USER');
+        $AUTOCONFIG["adminpass"] = getenv('NEXTCLOUD_ADMIN_PASSWORD');
+    }
 }
diff --git a/11.0/apache/config/autoconfig.php b/11.0/apache/config/autoconfig.php
index 7ff1d3e..b759f4d 100644
--- a/11.0/apache/config/autoconfig.php
+++ b/11.0/apache/config/autoconfig.php
@@ -1,29 +1,34 @@
 <?php
+
+$autoconfig_enabled = false;
+
 if (getenv('SQLITE_DATABASE')) {
     $AUTOCONFIG["dbtype"] = "sqlite";
     $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
-    $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
+    $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
     $AUTOCONFIG["dbtype"] = "mysql";
     $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
     $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
     $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
     $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
-    $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
+    $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
     $AUTOCONFIG["dbtype"] = "pgsql";
     $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
     $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
     $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
     $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $autoconfig_enabled = true;
+}
+
+if ($autoconfig_enabled) {
     $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
-}
 
-if (getenv('NEXTCLOUD_DATA_DIR')) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR');
-}
+    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
 
-if (getenv('NEXTCLOUD_ADMIN_USER') && getenv('NEXTCLOUD_ADMIN_PASSWORD')) {
-    $AUTOCONFIG["adminlogin"] = getenv('NEXTCLOUD_ADMIN_USER');
-    $AUTOCONFIG["adminpass"] = getenv('NEXTCLOUD_ADMIN_PASSWORD');
+    if (getenv('NEXTCLOUD_ADMIN_USER') && getenv('NEXTCLOUD_ADMIN_PASSWORD')) {
+        $AUTOCONFIG["adminlogin"] = getenv('NEXTCLOUD_ADMIN_USER');
+        $AUTOCONFIG["adminpass"] = getenv('NEXTCLOUD_ADMIN_PASSWORD');
+    }
 }
diff --git a/11.0/fpm/config/autoconfig.php b/11.0/fpm/config/autoconfig.php
index 7ff1d3e..b759f4d 100644
--- a/11.0/fpm/config/autoconfig.php
+++ b/11.0/fpm/config/autoconfig.php
@@ -1,29 +1,34 @@
 <?php
+
+$autoconfig_enabled = false;
+
 if (getenv('SQLITE_DATABASE')) {
     $AUTOCONFIG["dbtype"] = "sqlite";
     $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
-    $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
+    $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
     $AUTOCONFIG["dbtype"] = "mysql";
     $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
     $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
     $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
     $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
-    $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
+    $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
     $AUTOCONFIG["dbtype"] = "pgsql";
     $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
     $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
     $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
     $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $autoconfig_enabled = true;
+}
+
+if ($autoconfig_enabled) {
     $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
-}
 
-if (getenv('NEXTCLOUD_DATA_DIR')) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR');
-}
+    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
 
-if (getenv('NEXTCLOUD_ADMIN_USER') && getenv('NEXTCLOUD_ADMIN_PASSWORD')) {
-    $AUTOCONFIG["adminlogin"] = getenv('NEXTCLOUD_ADMIN_USER');
-    $AUTOCONFIG["adminpass"] = getenv('NEXTCLOUD_ADMIN_PASSWORD');
+    if (getenv('NEXTCLOUD_ADMIN_USER') && getenv('NEXTCLOUD_ADMIN_PASSWORD')) {
+        $AUTOCONFIG["adminlogin"] = getenv('NEXTCLOUD_ADMIN_USER');
+        $AUTOCONFIG["adminpass"] = getenv('NEXTCLOUD_ADMIN_PASSWORD');
+    }
 }
diff --git a/12.0/apache/config/autoconfig.php b/12.0/apache/config/autoconfig.php
index 7ff1d3e..b759f4d 100644
--- a/12.0/apache/config/autoconfig.php
+++ b/12.0/apache/config/autoconfig.php
@@ -1,29 +1,34 @@
 <?php
+
+$autoconfig_enabled = false;
+
 if (getenv('SQLITE_DATABASE')) {
     $AUTOCONFIG["dbtype"] = "sqlite";
     $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
-    $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
+    $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
     $AUTOCONFIG["dbtype"] = "mysql";
     $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
     $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
     $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
     $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
-    $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
+    $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
     $AUTOCONFIG["dbtype"] = "pgsql";
     $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
     $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
     $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
     $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $autoconfig_enabled = true;
+}
+
+if ($autoconfig_enabled) {
     $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
-}
 
-if (getenv('NEXTCLOUD_DATA_DIR')) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR');
-}
+    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
 
-if (getenv('NEXTCLOUD_ADMIN_USER') && getenv('NEXTCLOUD_ADMIN_PASSWORD')) {
-    $AUTOCONFIG["adminlogin"] = getenv('NEXTCLOUD_ADMIN_USER');
-    $AUTOCONFIG["adminpass"] = getenv('NEXTCLOUD_ADMIN_PASSWORD');
+    if (getenv('NEXTCLOUD_ADMIN_USER') && getenv('NEXTCLOUD_ADMIN_PASSWORD')) {
+        $AUTOCONFIG["adminlogin"] = getenv('NEXTCLOUD_ADMIN_USER');
+        $AUTOCONFIG["adminpass"] = getenv('NEXTCLOUD_ADMIN_PASSWORD');
+    }
 }
diff --git a/12.0/fpm/config/autoconfig.php b/12.0/fpm/config/autoconfig.php
index 7ff1d3e..b759f4d 100644
--- a/12.0/fpm/config/autoconfig.php
+++ b/12.0/fpm/config/autoconfig.php
@@ -1,29 +1,34 @@
 <?php
+
+$autoconfig_enabled = false;
+
 if (getenv('SQLITE_DATABASE')) {
     $AUTOCONFIG["dbtype"] = "sqlite";
     $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
-    $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
+    $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
     $AUTOCONFIG["dbtype"] = "mysql";
     $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
     $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
     $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
     $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
-    $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
+    $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
     $AUTOCONFIG["dbtype"] = "pgsql";
     $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
     $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
     $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
     $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $autoconfig_enabled = true;
+}
+
+if ($autoconfig_enabled) {
     $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
-}
 
-if (getenv('NEXTCLOUD_DATA_DIR')) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR');
-}
+    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
 
-if (getenv('NEXTCLOUD_ADMIN_USER') && getenv('NEXTCLOUD_ADMIN_PASSWORD')) {
-    $AUTOCONFIG["adminlogin"] = getenv('NEXTCLOUD_ADMIN_USER');
-    $AUTOCONFIG["adminpass"] = getenv('NEXTCLOUD_ADMIN_PASSWORD');
+    if (getenv('NEXTCLOUD_ADMIN_USER') && getenv('NEXTCLOUD_ADMIN_PASSWORD')) {
+        $AUTOCONFIG["adminlogin"] = getenv('NEXTCLOUD_ADMIN_USER');
+        $AUTOCONFIG["adminpass"] = getenv('NEXTCLOUD_ADMIN_PASSWORD');
+    }
 }