From 90751994a6fdffa507baef889dd93ddb8bd270bc Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <thallian@users.noreply.github.com>
Date: Fri, 28 Oct 2016 15:35:43 +0200
Subject: [PATCH] Update config.inc.php.tmpl

---
 rootfs/etc/confd/templates/config.inc.php.tmpl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/rootfs/etc/confd/templates/config.inc.php.tmpl b/rootfs/etc/confd/templates/config.inc.php.tmpl
index ba58691..f5f5dd8 100644
--- a/rootfs/etc/confd/templates/config.inc.php.tmpl
+++ b/rootfs/etc/confd/templates/config.inc.php.tmpl
@@ -2,11 +2,11 @@
 
 $config = array();
 
-$config['db_dsnw'] = 'pgsql://{{getenv "DBUSER"}}:{{getenv "DBPASSWORD"}}@{{getenv "DBHOST"}}/{{getenv "DBNAME"}}';
+$config['db_dsnw'] = 'pgsql://{{getenv "DB_USER"}}:{{getenv "DB_PASSWORD"}}@{{getenv "DB_HOST"}}/{{getenv "DB_NAME"}}';
 $config['log_driver'] = 'syslog';
 $config['syslog_facility'] = LOG_USER;
 
-$config['default_host'] = '{{getenv "IMAPHOST"}}';
+$config['default_host'] = '{{getenv "IMAP_HOST" "tls://%n"}}';
 $config['imap_conn_options'] = array(
   'ssl'         => array(
       'verify_peer'      => false,
@@ -14,20 +14,20 @@ $config['imap_conn_options'] = array(
   ),
 );
 
-$config['smtp_server'] = '{{getenv "SMTPHOST"}}';
-$config['smtp_port'] = 587;
+$config['smtp_server'] = '{{getenv "SMTP_HOST" "tls://%n"}}';
+$config['smtp_port'] = {{getenv "SMTP_PORT" "587"}};
 $config['smtp_user'] = '%u';
 $config['smtp_pass'] = '%p';
-$config['smtp_conn_options'] = array(
+/*$config['smtp_conn_options'] = array(
   'ssl'         => array(
       'verify_peer'      => false,
       'verify_peer_name' => false,
   ),
-);
+);*/
 
 $config['use_https'] = true;
-$config['des_key'] = '{{getenv "KEY"}}';
-$config['cipher_method'] = '{{getenv "CIPHERMETHOD"}}';
+$config['des_key'] = '{{getenv "SECRET_KEY"}}';
+$config['cipher_method'] = '{{getenv "CIPHER_METHOD" "AES-256-CBC"}}';
 
 $config['mail_domain'] = '%t';
 $config['username_domain'] = '%d';