diff options
author | Tilo Spannagel <development@tilosp.de> | 2019-09-13 11:16:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-13 11:16:37 +0200 |
commit | cc2952f6f5f78b41dabb099814305251fdaa762c (patch) | |
tree | 094009c08e071ff6906822c7bdf075c15097f8b7 /17.0-rc/fpm/config | |
parent | 73ff5c860d155d46ed65b6ae9caa9ee6e64478de (diff) | |
parent | 7d0e49e5dd0ad4d721492ab04fde33111256d301 (diff) |
Merge pull request #862 from tilosp/bot/update
Update to 17.0.0RC1
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 | 31 | ||||
-rw-r--r-- | 17.0-rc/fpm/config/redis.config.php | 13 | ||||
-rw-r--r-- | 17.0-rc/fpm/config/smtp.config.php | 15 |
5 files changed, 78 insertions, 0 deletions
diff --git a/17.0-rc/fpm/config/apcu.config.php b/17.0-rc/fpm/config/apcu.config.php new file mode 100644 index 00000000..69fed876 --- /dev/null +++ b/17.0-rc/fpm/config/apcu.config.php @@ -0,0 +1,4 @@ +<?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 new file mode 100644 index 00000000..a4bed833 --- /dev/null +++ b/17.0-rc/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, + ), + ), +); diff --git a/17.0-rc/fpm/config/autoconfig.php b/17.0-rc/fpm/config/autoconfig.php new file mode 100644 index 00000000..deeabe4e --- /dev/null +++ b/17.0-rc/fpm/config/autoconfig.php @@ -0,0 +1,31 @@ +<?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) { + if (getenv('NEXTCLOUD_TABLE_PREFIX')) { + $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX'); + } + + $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 new file mode 100644 index 00000000..19676160 --- /dev/null +++ b/17.0-rc/fpm/config/redis.config.php @@ -0,0 +1,13 @@ +<?php +if (getenv('REDIS_HOST')) { + $CONFIG = array ( + 'memcache.distributed' => '\OC\Memcache\Redis', + 'memcache.locking' => '\OC\Memcache\Redis', + 'redis' => array( + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_HOST_PORT') ?: 6379, + 'password' => getenv('REDIS_HOST_PASSWORD'), + ), + ); +} + diff --git a/17.0-rc/fpm/config/smtp.config.php b/17.0-rc/fpm/config/smtp.config.php new file mode 100644 index 00000000..59f1eaa1 --- /dev/null +++ b/17.0-rc/fpm/config/smtp.config.php @@ -0,0 +1,15 @@ +<?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'), + ); +} |