From 7d86347a351aa5263c19cd03aa0bda4650c8bfca Mon Sep 17 00:00:00 2001
From: Alexander Alexeev
Date: Sat, 12 Nov 2016 01:33:30 +0700
Subject: juick.conf example corrected

---
 juick-core/src/main/resources/juick.conf.example   | 45 ++++++++++++++++++++++
 .../src/main/webapp/WEB-INF/juick.conf.example     |  2 -
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 juick-core/src/main/resources/juick.conf.example
 delete mode 100644 juick-rss/src/main/webapp/WEB-INF/juick.conf.example

diff --git a/juick-core/src/main/resources/juick.conf.example b/juick-core/src/main/resources/juick.conf.example
new file mode 100644
index 00000000..306a4e93
--- /dev/null
+++ b/juick-core/src/main/resources/juick.conf.example
@@ -0,0 +1,45 @@
+#Driver
+datasource_driver=net.sf.log4jdbc.DriverSpy
+!datasource_driver=com.mysql.jdbc.Driver
+
+#Url
+!datasource_url=jdbc:mysql://localhost:3306/juick?autoReconnect=true&zeroDateTimeBehavior=convertToNull&characterEncoding=UTF8
+datasource_url=jdbc:log4jdbc:mysql://localhost:3306/juick?autoReconnect=true&zeroDateTimeBehavior=convertToNull&characterEncoding=UTF8
+
+#Username
+datasource_user=
+
+#Password
+datasource_password=
+
+twitter_consumer_key=
+twitter_consumer_secret=
+
+crosspost_jid=
+ws_jid=
+push_jid=
+
+xmpp_host=
+xmpp_port=
+xmpp_password=
+
+push_xmpp_password=
+
+wns_application_sip=
+wns_client_secret=
+gcm_key=
+
+hostname=
+componentname=
+component_name=
+component_host=
+component_port=
+s2s_port=
+xmppbot_jid=juick@juick.com/Juick
+
+keystore=
+keystore_password=
+broken_ssl_hosts=
+banned_hosts=
+
+upload_tmp_dir=
\ No newline at end of file
diff --git a/juick-rss/src/main/webapp/WEB-INF/juick.conf.example b/juick-rss/src/main/webapp/WEB-INF/juick.conf.example
deleted file mode 100644
index 2cb6f4f7..00000000
--- a/juick-rss/src/main/webapp/WEB-INF/juick.conf.example
+++ /dev/null
@@ -1,2 +0,0 @@
-datasource_driver=org.h2.Driver
-datasource_url=jdbc:h2:~/test
-- 
cgit v1.2.3