From 45bf61d190fffd174b1effa3b0d211219ebd1fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Br=C3=BCckner?= Date: Fri, 14 Sep 2018 08:26:57 +0200 Subject: [PATCH] remove admin password and user name from autoconfig --- .config/autoconfig.php | 5 ----- 12.0/apache/config/autoconfig.php | 5 ----- 12.0/fpm-alpine/config/autoconfig.php | 5 ----- 12.0/fpm/config/autoconfig.php | 5 ----- 13.0/apache/config/autoconfig.php | 5 ----- 13.0/fpm-alpine/config/autoconfig.php | 5 ----- 13.0/fpm/config/autoconfig.php | 5 ----- 14.0/apache/config/autoconfig.php | 5 ----- 14.0/fpm-alpine/config/autoconfig.php | 5 ----- 14.0/fpm/config/autoconfig.php | 5 ----- 10 files changed, 50 deletions(-) diff --git a/.config/autoconfig.php b/.config/autoconfig.php index b759f4d..85e0221 100644 --- a/.config/autoconfig.php +++ b/.config/autoconfig.php @@ -26,9 +26,4 @@ if ($autoconfig_enabled) { $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: ""; $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'); - } } diff --git a/12.0/apache/config/autoconfig.php b/12.0/apache/config/autoconfig.php index b759f4d..85e0221 100644 --- a/12.0/apache/config/autoconfig.php +++ b/12.0/apache/config/autoconfig.php @@ -26,9 +26,4 @@ if ($autoconfig_enabled) { $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: ""; $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'); - } } diff --git a/12.0/fpm-alpine/config/autoconfig.php b/12.0/fpm-alpine/config/autoconfig.php index b759f4d..85e0221 100644 --- a/12.0/fpm-alpine/config/autoconfig.php +++ b/12.0/fpm-alpine/config/autoconfig.php @@ -26,9 +26,4 @@ if ($autoconfig_enabled) { $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: ""; $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'); - } } diff --git a/12.0/fpm/config/autoconfig.php b/12.0/fpm/config/autoconfig.php index b759f4d..85e0221 100644 --- a/12.0/fpm/config/autoconfig.php +++ b/12.0/fpm/config/autoconfig.php @@ -26,9 +26,4 @@ if ($autoconfig_enabled) { $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: ""; $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'); - } } diff --git a/13.0/apache/config/autoconfig.php b/13.0/apache/config/autoconfig.php index b759f4d..85e0221 100644 --- a/13.0/apache/config/autoconfig.php +++ b/13.0/apache/config/autoconfig.php @@ -26,9 +26,4 @@ if ($autoconfig_enabled) { $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: ""; $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'); - } } diff --git a/13.0/fpm-alpine/config/autoconfig.php b/13.0/fpm-alpine/config/autoconfig.php index b759f4d..85e0221 100644 --- a/13.0/fpm-alpine/config/autoconfig.php +++ b/13.0/fpm-alpine/config/autoconfig.php @@ -26,9 +26,4 @@ if ($autoconfig_enabled) { $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: ""; $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'); - } } diff --git a/13.0/fpm/config/autoconfig.php b/13.0/fpm/config/autoconfig.php index b759f4d..85e0221 100644 --- a/13.0/fpm/config/autoconfig.php +++ b/13.0/fpm/config/autoconfig.php @@ -26,9 +26,4 @@ if ($autoconfig_enabled) { $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: ""; $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'); - } } diff --git a/14.0/apache/config/autoconfig.php b/14.0/apache/config/autoconfig.php index b759f4d..85e0221 100644 --- a/14.0/apache/config/autoconfig.php +++ b/14.0/apache/config/autoconfig.php @@ -26,9 +26,4 @@ if ($autoconfig_enabled) { $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: ""; $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'); - } } diff --git a/14.0/fpm-alpine/config/autoconfig.php b/14.0/fpm-alpine/config/autoconfig.php index b759f4d..85e0221 100644 --- a/14.0/fpm-alpine/config/autoconfig.php +++ b/14.0/fpm-alpine/config/autoconfig.php @@ -26,9 +26,4 @@ if ($autoconfig_enabled) { $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: ""; $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'); - } } diff --git a/14.0/fpm/config/autoconfig.php b/14.0/fpm/config/autoconfig.php index b759f4d..85e0221 100644 --- a/14.0/fpm/config/autoconfig.php +++ b/14.0/fpm/config/autoconfig.php @@ -26,9 +26,4 @@ if ($autoconfig_enabled) { $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: ""; $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'); - } }