From 324d0b67be15918c12f7e34ae95c68b6261a232c Mon Sep 17 00:00:00 2001 From: or-else Date: Wed, 25 Apr 2018 09:47:31 -0700 Subject: [PATCH] updates for clarification and a link fix --- INSTALL.md | 4 ++-- build-all.sh | 3 +-- server/templ/email-validation-body.templ | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index ad61b2657..e59ac1652 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -134,11 +134,11 @@ Otherwise `SIGHUP` may be received by the server if the shell connection is brok For more details see https://github.com/tinode/chat/issues/25. -## Using MySQL Storage (experimental) +## Using MySQL Storage 1. Follow instructions for building from sources replacing all occurences of `-tags rethinkdb` with `-tags mysql`. -2. Make sure MySQL (or MariaDB or Percona) is installed and running. The code has been tested with MySQL 5.7 but should work with earlier versions as well. +2. Make sure MySQL (or MariaDB or Percona) is installed and running. The code has been tested with MySQL 5.7 using InnoDB engine but should work with earlier versions as well. MyISAM engine was not tested. 3. Open `tinode.conf`. In the section `"store_config"` find `"use_adapter": "rethinkdb"` and replace it with `"use_adapter": "mysql"`. Check that the [DSN](https://github.com/go-sql-driver/mysql#dsn-data-source-name) in `"mysql"` section is appropriate for your MySQL installation. Option `parseTime=true` is required. ```js diff --git a/build-all.sh b/build-all.sh index f04684bbc..ed0b89c87 100755 --- a/build-all.sh +++ b/build-all.sh @@ -51,10 +51,9 @@ do rm -f $GOPATH/bin/init-db # Build tinode server and database initializer for RethinkDb and MySQL. ~/go/bin/gox -osarch="${plat}/${arc}" \ - -ldflags "-X main.buildstamp=`date -u '+%Y%m%dT%H:%M:%SZ'` -X main.builtfordb=${dbtag}" \ + -ldflags "-X main.buildstamp=`git describe --tags`" \ -tags ${dbtag} -output $GOPATH/bin/tinode ./server > /dev/null ~/go/bin/gox -osarch="${plat}/${arc}" \ - -ldflags "-X main.builtfordb=${dbtag}" \ -tags ${dbtag} -output $GOPATH/bin/init-db ./tinode-db > /dev/null # Tar on Mac is inflexible about directories. Let's just copy release files to # one directory. diff --git a/server/templ/email-validation-body.templ b/server/templ/email-validation-body.templ index e6fd2634a..fa15ca8f7 100644 --- a/server/templ/email-validation-body.templ +++ b/server/templ/email-validation-body.templ @@ -6,9 +6,9 @@

You're receiving this message because someone used your email to register at Tinode.

-

Click to confirm +

Click to confirm or go to -https://api.tinode.co/x/example-react-js/#cred?what=email +https://api.tinode.co/x/example-react-js/#cred?method=email (you may need to enter login and password) and enter the following code:

{{.Code}}