more port updates in various places

sayi21cn · Mar 28, 2020 · 075c90d · 075c90d
1 parent 23106c2
commit 075c90d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/chatbot/python/chatbot.py b/chatbot/python/chatbot.py
@@ -349,7 +349,7 @@ def exit_gracefully(signo, stack_frame):
     purpose = "Tino, Tinode's chatbot."
     print(purpose)
     parser = argparse.ArgumentParser(description=purpose)
-    parser.add_argument('--host', default='localhost:6061', help='address of Tinode server gRPC endpoint')
+    parser.add_argument('--host', default='localhost:16060', help='address of Tinode server gRPC endpoint')
     parser.add_argument('--ssl', action='store_true', help='use SSL to connect to the server')
     parser.add_argument('--ssl-host', help='SSL host name to use instead of default (useful for connecting to localhost)')
     parser.add_argument('--listen', default='0.0.0.0:40051', help='address to listen on for incoming Plugin API calls')

diff --git a/docker/chatbot/Dockerfile b/docker/chatbot/Dockerfile
@@ -4,7 +4,7 @@ FROM python:3.7-slim
 
 ARG VERSION=0.16
 ARG LOGIN_AS=
-ARG TINODE_HOST=tinode-srv:6061
+ARG TINODE_HOST=tinode-srv:16060
 ENV VERSION=$VERSION
 ARG BINVERS=$VERSION
 

diff --git a/docker/docker-compose/single-instance.yml b/docker/docker-compose/single-instance.yml
@@ -41,7 +41,7 @@ x-tinode-env-vars: &tinode-env-vars
   # "IOS_UNIV_LINKS_APP_ID": "<ios universal links app id>"
 
 x-exporter-env-vars: &exporter-env-vars
-  "TINODE_ADDR": "http://tinode.host:18080/stats/expvar/"
+  "TINODE_ADDR": "http://tinode.host:6060/stats/expvar/"
   # InfluxDB configation:
   "SERVE_FOR": "influxdb"
   "INFLUXDB_VERSION": 1.7
@@ -81,7 +81,7 @@ services:
     #   # Logs directory.
     #   - <path to your tinode-0 logs directory>:/var/log
     ports:
-      - "6060:18080"
+      - "6060:6060"
     environment:
       << : *tinode-env-vars
       "RESET_DB": ${RESET_DB:-false}
@@ -102,4 +102,4 @@ services:
       - tinode-0:tinode.host
     environment:
       << : *exporter-env-vars
-      "WAIT_FOR": "tinode-0:18080"
+      "WAIT_FOR": "tinode-0:6060"
diff --git a/docker/tinode/Dockerfile b/docker/tinode/Dockerfile
@@ -130,4 +130,4 @@ RUN chmod +x credentials.sh
 ENTRYPOINT ./entrypoint.sh
 
 # HTTP, gRPC, cluster ports
-EXPOSE 6060 16060 12000-12002
+EXPOSE 6060 16060 12000-12003
diff --git a/server/tinode.conf b/server/tinode.conf
@@ -21,7 +21,7 @@
 	// TCP host:port or unix:/path/to/socket to listen for gRPC clients.
 	// Leave blank to disable gRPC support.
 	// Could be overridden from the command line with --grpc_listen.
-	"grpc_listen": ":6061",
+	"grpc_listen": ":16060",
 
 	// Enable handling of gRPC keepalives https://github.com/grpc/grpc/blob/master/doc/keepalive.md
 	// This sets server's GRPC_ARG_KEEPALIVE_TIME_MS to 60 seconds instead of the default 2 hours.