From 720dbdbfcd0d9561bc55deafa2c1c1563d942001 Mon Sep 17 00:00:00 2001 From: makc Date: Tue, 19 Dec 2017 00:36:56 +0100 Subject: dev docs update --- README.md | 8 +++++--- juick-www/src/main/resources/juick.conf.example | 14 +++++++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 21ceb6a6..52692204 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Juick --- +Далее предполагается, что уже установлен и запущен mysql с пользователем user. + ``` git clone git@x.juick.com:/srv/git/juick.git @@ -12,7 +14,7 @@ mysql -u user -p create database juick; exit -mysql -u user -p < juick-server/src/main/resources/schema.sql +mysql -u user -p < juick-server-core/src/main/resources/schema.sql mysql -u user -p use juick; @@ -24,8 +26,8 @@ mysql -u user -p ``` datasource_url=jdbc:mysql://localhost/juick - datasource_user=juick - datasource_password=juick + datasource_user=user + datasource_password=password ``` Для сборки front-end необходим установленный npm (runtime node js) не ниже 3-й версии и jdk8 diff --git a/juick-www/src/main/resources/juick.conf.example b/juick-www/src/main/resources/juick.conf.example index bbe2a9e5..1d992881 100644 --- a/juick-www/src/main/resources/juick.conf.example +++ b/juick-www/src/main/resources/juick.conf.example @@ -1,4 +1,16 @@ -mysql_username=username +datasource_url=jdbc:mysql://localhost/juick +datasource_user=user +datasource_password=password +auth_remember_me_key=123 +facebook_appid=123 +facebook_secret=123 +twitter_consumer_key=123 +twitter_consumer_secret=123 +vk_appid=123 +vk_secret=123 +cloudflare_auth_email=e@ma.il +cloudflare_api_key=123 +cloudflare_zone_id=123 xmpp_password=secret sape_user=usertoken wns_application_sip=ms-app://x-1-11-1-1111111111-... -- cgit v1.2.3