From 3b149d10572392da66f57a7e2aaac53ba424e45c Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Tue, 27 Sep 2011 15:17:59 +0200
Subject: Added TLS settings

---
 src/main.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index db55e08..668bdbf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -343,15 +343,19 @@ int main (int argc, char **argv) {
 #endif
 	PianoInit (&app.ph);
 
+	BarSettingsInit (&app.settings);
+	BarSettingsRead (&app.settings);
+
+#ifdef ENABLE_TLS
+	WaitressInit (&app.waith, app.settings.tlsCaPath);
+#else
 	WaitressInit (&app.waith, NULL);
+#endif
 	app.waith.url.host = strdup (PIANO_RPC_HOST);
 #ifdef ENABLE_TLS
-	app.waith.url.tls = true;
+	app.waith.url.tls = app.settings.tls;
 #endif
 
-	BarSettingsInit (&app.settings);
-	BarSettingsRead (&app.settings);
-
 	BarUiMsg (&app.settings, MSG_NONE,
 			"Welcome to " PACKAGE " (" VERSION ")! ");
 	if (app.settings.keys[BAR_KS_HELP] == BAR_KS_DISABLED) {
-- 
cgit v1.2.3