Skip to content

Commit

Permalink
updates for clarification and a link fix
Browse files Browse the repository at this point in the history
  • Loading branch information
or-else committed Apr 25, 2018
1 parent 844dbc9 commit 324d0b6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions build-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions server/templ/email-validation-body.templ
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<p>You're receiving this message because someone used your email to register at
<a href="https://api.tinode.co/x/example-react-js/">Tinode</a>.</p>
<p><a href="https://api.tinode.co/x/example-react-js/#cred?what=email?code={{.Code}}">Click</a> to confirm
<p><a href="https://api.tinode.co/x/example-react-js/#cred?method=email&code={{.Code}}">Click</a> to confirm
or go to
<a href="https://api.tinode.co/x/example-react-js/#cred?what=email">https://api.tinode.co/x/example-react-js/#cred?what=email</a>
<a href="https://api.tinode.co/x/example-react-js/#cred?what=email">https://api.tinode.co/x/example-react-js/#cred?method=email</a>
(you may need to enter login and password) and enter the following code:</p>
<blockquote>{{.Code}}</blockquote>
Expand Down

0 comments on commit 324d0b6

Please sign in to comment.