diff options
author | tilosp-bot <git-bot@tilosp.de> | 2020-08-27 15:31:23 +0000 |
---|---|---|
committer | tilosp-bot <git-bot@tilosp.de> | 2020-08-27 15:31:23 +0000 |
commit | 1353c04b9fb456e76d1900be034aa746f878ac5f (patch) | |
tree | 6f6908d4f596813c860abbbedf1cf0ec90fb1dad /17.0-rc/fpm/config | |
parent | e0247dc3cd9de9c70d9dec0c68d9a27e7a078376 (diff) |
Run update.sh
Signed-off-by: tilosp-bot <git-bot@tilosp.de>
Diffstat (limited to '17.0-rc/fpm/config')
-rw-r--r-- | 17.0-rc/fpm/config/apcu.config.php | 4 | ||||
-rw-r--r-- | 17.0-rc/fpm/config/apps.config.php | 15 | ||||
-rw-r--r-- | 17.0-rc/fpm/config/autoconfig.php | 27 | ||||
-rw-r--r-- | 17.0-rc/fpm/config/redis.config.php | 17 | ||||
-rw-r--r-- | 17.0-rc/fpm/config/reverse-proxy.config.php | 25 | ||||
-rw-r--r-- | 17.0-rc/fpm/config/smtp.config.php | 15 |
6 files changed, 0 insertions, 103 deletions
diff --git a/17.0-rc/fpm/config/apcu.config.php b/17.0-rc/fpm/config/apcu.config.php deleted file mode 100644 index 69fed876..00000000 --- a/17.0-rc/fpm/config/apcu.config.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php -$CONFIG = array ( - 'memcache.local' => '\OC\Memcache\APCu', -); diff --git a/17.0-rc/fpm/config/apps.config.php b/17.0-rc/fpm/config/apps.config.php deleted file mode 100644 index a4bed833..00000000 --- a/17.0-rc/fpm/config/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/17.0-rc/fpm/config/autoconfig.php b/17.0-rc/fpm/config/autoconfig.php deleted file mode 100644 index 5bb85d42..00000000 --- a/17.0-rc/fpm/config/autoconfig.php +++ /dev/null @@ -1,27 +0,0 @@ -<?php - -$autoconfig_enabled = false; - -if (getenv('SQLITE_DATABASE')) { - $AUTOCONFIG["dbtype"] = "sqlite"; - $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); - $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_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["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; -} diff --git a/17.0-rc/fpm/config/redis.config.php b/17.0-rc/fpm/config/redis.config.php deleted file mode 100644 index 9429c901..00000000 --- a/17.0-rc/fpm/config/redis.config.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php -if (getenv('REDIS_HOST')) { - $CONFIG = array ( - 'memcache.distributed' => '\OC\Memcache\Redis', - 'memcache.locking' => '\OC\Memcache\Redis', - 'redis' => array( - 'host' => getenv('REDIS_HOST'), - 'password' => getenv('REDIS_HOST_PASSWORD'), - ), - ); - - if (getenv('REDIS_HOST_PORT') !== false) { - $CONFIG['redis']['port'] = (int) getenv('REDIS_HOST_PORT'); - } elseif (getenv('REDIS_HOST')[0] != '/') { - $CONFIG['redis']['port'] = 6379; - } -} diff --git a/17.0-rc/fpm/config/reverse-proxy.config.php b/17.0-rc/fpm/config/reverse-proxy.config.php deleted file mode 100644 index 667be312..00000000 --- a/17.0-rc/fpm/config/reverse-proxy.config.php +++ /dev/null @@ -1,25 +0,0 @@ -<?php -$overwriteHost = getenv('OVERWRITEHOST'); -if ($overwriteHost) { - $CONFIG['overwritehost'] = $overwriteHost; -} - -$overwriteProtocol = getenv('OVERWRITEPROTOCOL'); -if ($overwriteProtocol) { - $CONFIG['overwriteprotocol'] = $overwriteProtocol; -} - -$overwriteWebRoot = getenv('OVERWRITEWEBROOT'); -if ($overwriteWebRoot) { - $CONFIG['overwritewebroot'] = $overwriteWebRoot; -} - -$overwriteCondAddr = getenv('OVERWRITECONDADDR'); -if ($overwriteCondAddr) { - $CONFIG['overwritecondaddr'] = $overwriteCondAddr; -} - -$trustedProxies = getenv('TRUSTED_PROXIES'); -if ($trustedProxies) { - $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies))); -} diff --git a/17.0-rc/fpm/config/smtp.config.php b/17.0-rc/fpm/config/smtp.config.php deleted file mode 100644 index 59f1eaa1..00000000 --- a/17.0-rc/fpm/config/smtp.config.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php -if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) { - $CONFIG = array ( - 'mail_smtpmode' => 'smtp', - 'mail_smtphost' => getenv('SMTP_HOST'), - 'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25), - 'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '', - 'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'), - 'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN', - 'mail_smtpname' => getenv('SMTP_NAME') ?: '', - 'mail_smtppassword' => getenv('SMTP_PASSWORD') ?: '', - 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'), - 'mail_domain' => getenv('MAIL_DOMAIN'), - ); -} |