aboutsummaryrefslogtreecommitdiff
path: root/setup/default.xml
diff options
context:
space:
mode:
authorShinryuken <watertext@hotmail.it>2017-11-19 11:22:31 +0100
committerGitHub <noreply@github.com>2017-11-19 11:22:31 +0100
commita5b273f8f8afd1a67613517c6487642601070456 (patch)
treebabc63f5d50977fc91b3946b1da2e86ec74c51a5 /setup/default.xml
parentc7928ef4a722cb40e9911c8e76e308fc48c85567 (diff)
parentfb9cbb2b74dc0060bd0dc5d0b3bfeb958ed6f3b5 (diff)
downloadtrackermap-server-a5b273f8f8afd1a67613517c6487642601070456.tar.gz
trackermap-server-a5b273f8f8afd1a67613517c6487642601070456.tar.bz2
trackermap-server-a5b273f8f8afd1a67613517c6487642601070456.zip
Merge branch 'master' into payload-as-form-param
Diffstat (limited to 'setup/default.xml')
-rw-r--r--setup/default.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/setup/default.xml b/setup/default.xml
index 8752432c6..3424e8187 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -35,7 +35,7 @@
<entry key='database.loginUser'>
SELECT * FROM users
- WHERE email = :email
+ WHERE email = :email OR login = :email
</entry>
<entry key='database.selectPositions'>
@@ -220,5 +220,7 @@
<entry key='flespi.port'>5149</entry>
<entry key='dway.port'>5150</entry>
<entry key='recoda.port'>5151</entry>
+ <entry key='oko.port'>5152</entry>
+ <entry key='ivt401.port'>5153</entry>
</properties>