From 579b855313776a21934a1180804af37506b186e3 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 1 Nov 2016 14:41:29 +0100 Subject: [PATCH] Update config.php.tmpl --- rootfs/etc/confd/templates/config.php.tmpl | 31 +++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/rootfs/etc/confd/templates/config.php.tmpl b/rootfs/etc/confd/templates/config.php.tmpl index 108c00c..5680b95 100644 --- a/rootfs/etc/confd/templates/config.php.tmpl +++ b/rootfs/etc/confd/templates/config.php.tmpl @@ -10,26 +10,26 @@ $CONFIG = array( 'datadirectory' => '/var/lib/nextcloud/data', 'dbtype' => 'pgsql', -'dbhost' => '{{getenv "DBHOST"}}', -'dbname' => '{{getenv "DBNAME"}}', -'dbuser' => '{{getenv "DBUSER"}}', -'dbpassword' => '{{getenv "DBPASSWORD"}}', -'dbtableprefix' => '{{getenv "DBTABLEPREFIX"}}', +'dbhost' => '{{getenv "DB_HOST"}}', +'dbname' => '{{getenv "DB_NAME"}}', +'dbuser' => '{{getenv "DB_USER"}}', +'dbpassword' => '{{getenv "DB_PASSWORD"}}', +'dbtableprefix' => '{{getenv "DB_TABLE_PREFIX"}}', 'skeletondirectory' => '', -'mail_domain' => '{{getenv "MAILDOMAIN"}}', -'mail_from_address' => '{{getenv "MAILFROM"}}', +'mail_domain' => '{{getenv "MAIL_DOMAIN"}}', +'mail_from_address' => '{{getenv "MAIL_FROM"}}', 'mail_smtpdebug' => false, 'mail_smtpmode' => 'smtp', -'mail_smtphost' => '{{getenv "MAILSMTPHOST"}}', -'mail_smtpport' => {{getenv "MAILSMTPPORT"}}, +'mail_smtphost' => '{{getenv "MAIL_SMTP_HOST"}}', +'mail_smtpport' => {{getenv "MAILSMTPPORT" "587"}}, 'mail_smtptimeout' => 10, -'mail_smtpsecure' => '{{getenv "MAILSMTPSECURITY"}}', -'mail_smtpauth' => {{getenv "MAILSMTPAUTH"}}, -'mail_smtpauthtype' => '{{getenv "MAILSMTPAUTHTYPE"}}', -'mail_smtpname' => '{{getenv "MAILSMTPNAME"}}', -'mail_smtppassword' => '{{getenv "MAILSMTPPASSWORD"}}', +'mail_smtpsecure' => '{{getenv "MAIL_SMTP_SECURITY" "tls"}}', +'mail_smtpauth' => {{getenv "MAIL_SMTP_AUTH" "true"}}, +'mail_smtpauthtype' => '{{getenv "MAIL_SMTP_AUTH_TYPE" "PLAIN"}}', +'mail_smtpname' => '{{getenv "MAIL_SMTP_NAME"}}', +'mail_smtppassword' => '{{getenv "MAIL_SMTP_PASSWORD"}}', 'overwritehost' => '{{getenv "DOMAIN"}}', 'overwriteprotocol' => 'https', @@ -51,6 +51,7 @@ $CONFIG = array( 'memcache.local' => '\OC\Memcache\APCu', 'assetdirectory' => '/var/lib/nextcloud', +'mount_file' => '/var/lib/nextcloud/data/mount.json', 'installed' => true, -'version' => '10.0.0.0', +'version' => '9.1.1.5', );