Fixes for installing servus.ai as multi protocol client

Ubuntu · Ubuntu · commit 14a38ab72524 · 2018-02-04T20:37:19.000Z
diff --git a/bots/servusai/facebook/servusai-facebook.service b/bots/servusai/facebook/servusai-facebook.service
@@ -3,7 +3,7 @@ Description=Y-Bot Facebook Client
 
 [Service]
 User=ubuntu
-ExecStart=/opt/program-y/bots/servusai/servusai-facebook.sh
+ExecStart=/opt/program-y/bots/servusai/facebook/servusai-facebook.sh
 Restart=always
 
 [Install]
diff --git a/bots/servusai/facebook/servusai-facebook.sh b/bots/servusai/facebook/servusai-facebook.sh
@@ -6,5 +6,5 @@ export PYTHONPATH=/opt/program-y/src:.
 
 cd /opt/program-y
 
-python3 /opt/program-y/src/programy/clients/facebook.py --config /opt/program-y/bots/servusai/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
+python3 /opt/program-y/src/programy/clients/facebook.py --config /opt/program-y/bots/servusai/facebook/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
 
diff --git a/bots/servusai/rest/servusai-rest.service b/bots/servusai/rest/servusai-rest.service
diff --git a/bots/servusai/rest/servusai-rest.sh b/bots/servusai/rest/servusai-rest.sh
diff --git a/bots/servusai/socket/servusai-socket.service b/bots/servusai/socket/servusai-socket.service
diff --git a/bots/servusai/socket/servusai-socket.sh b/bots/servusai/socket/servusai-socket.sh
@@ -6,5 +6,5 @@ export PYTHONPATH=/opt/program-y/src:.
 
 cd /opt/program-y
 
-python3 /opt/program-y/src/programy/clients/socket.py --config /opt/program-y/bots/servusai/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
+python3 /opt/program-y/src/programy/clients/tcpsocket.py --config /opt/program-y/bots/servusai/socket/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
 
diff --git a/bots/servusai/telegram/servusai-telegram.service b/bots/servusai/telegram/servusai-telegram.service
@@ -3,7 +3,7 @@ Description=Y-Bot Telegram Client
 
 [Service]
 User=ubuntu
-ExecStart=/opt/program-y/bots/servusai/servusai-telegram.sh
+ExecStart=/opt/program-y/bots/servusai/telegram/servusai-telegram.sh
 Restart=always
 
 [Install]
diff --git a/bots/servusai/telegram/servusai-telegram.sh b/bots/servusai/telegram/servusai-telegram.sh
@@ -6,5 +6,5 @@ export PYTHONPATH=/opt/program-y/src:.
 
 cd /opt/program-y
 
-python3 /opt/program-y/src/programy/clients/webchat/chatsrv.py --config /opt/program-y/bots/servusai/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
+python3 /opt/program-y/src/programy/clients/telegram_client.py --config /opt/program-y/bots/servusai/telegram/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
 
diff --git a/bots/servusai/twitter/servusai-twitter.service b/bots/servusai/twitter/servusai-twitter.service
@@ -3,7 +3,7 @@ Description=Y-Bot Twitter Client
 
 [Service]
 User=ubuntu
-ExecStart=/opt/program-y/bots/servusai/servusai-twitter.sh
+ExecStart=/opt/program-y/bots/servusai/twitter/servusai-twitter.sh
 Restart=always
 
 [Install]
diff --git a/bots/servusai/twitter/servusai-twitter.sh b/bots/servusai/twitter/servusai-twitter.sh
@@ -6,5 +6,5 @@ export PYTHONPATH=/opt/program-y/src:.
 
 cd /opt/program-y
 
-python3 /opt/program-y/src/programy/clients/webchat/chatsrv.py --config /opt/program-y/bots/servusai/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
+python3 /opt/program-y/src/programy/clients/twitter.py --config /opt/program-y/bots/servusai/twitter/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
 
diff --git a/bots/servusai/twitter/storage/twitter.data b/bots/servusai/twitter/storage/twitter.data
@@ -0,0 +1,2 @@
+907201787454730245
+960241295712284672
diff --git a/bots/servusai/twitter/twitter.sh b/bots/servusai/twitter/twitter.sh
@@ -4,4 +4,4 @@ clear
 
 export PYTHONPATH=../../../src:.
 
-python3 ../../../src/programy/clients/twitter.py --config ./config.yaml --cformat yaml --logging ../../y-bot/logging.yaml
+python3 ../../../src/programy/clients/twitter.py --config ./config.yaml --cformat yaml --logging ../../y-bot/logging.yaml
diff --git a/bots/servusai/web/servusai-web.service b/bots/servusai/web/servusai-web.service
@@ -3,7 +3,7 @@ Description=Y-Bot Web Chat Client
 
 [Service]
 User=ubuntu
-ExecStart=/opt/program-y/bots/servusai/servusai-web.sh
+ExecStart=/opt/program-y/bots/servusai/web/servusai-web.sh
 Restart=always
 
 [Install]
diff --git a/bots/servusai/web/servusai-web.sh b/bots/servusai/web/servusai-web.sh
@@ -6,5 +6,5 @@ export PYTHONPATH=/opt/program-y/src:.
 
 cd /opt/program-y
 
-python3 /opt/program-y/src/programy/clients/webchat/chatsrv.py --config /opt/program-y/bots/servusai/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
+python3 /opt/program-y/src/programy/clients/webchat/chatsrv.py --config /opt/program-y/bots/servusai/web/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
 
diff --git a/bots/servusai/xmpp/servusai-xmpp.service b/bots/servusai/xmpp/servusai-xmpp.service
@@ -3,7 +3,7 @@ Description=Y-Bot Google Talk Client
 
 [Service]
 User=ubuntu
-ExecStart=/opt/program-y/bots/servusai/servusai-xmpp.sh
+ExecStart=/opt/program-y/bots/servusai/xmpp/servusai-xmpp.sh
 Restart=always
 
 [Install]
diff --git a/bots/servusai/xmpp/servusai-xmpp.sh b/bots/servusai/xmpp/servusai-xmpp.sh
@@ -6,5 +6,5 @@ export PYTHONPATH=/opt/program-y/src:.
 
 cd /opt/program-y
 
-python3 /opt/program-y/src/programy/clients/webchat/chatsrv.py --config /opt/program-y/bots/servusai/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
+python3 /opt/program-y/src/programy/clients/xmpp.py --config /opt/program-y/bots/servusai/xmpp/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
 
diff --git a/bots/y-bot/web.sh b/bots/y-bot/web.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export PYTHONPATH=../../src:.
+
+/usr/bin/python3 ../../src/programy/clients/webchat/chatsrv.py --config ./config.yaml --cformat yaml --logging ./logging.yaml
+
diff --git a/python3 b/python3
@@ -0,0 +1 @@
+/usr/bin/python3.6

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ export PYTHONPATH=/opt/program-y/src:.`
`6`	`6`
`7`	`7`	`cd /opt/program-y`
`8`	`8`
`9`		`-python3 /opt/program-y/src/programy/clients/facebook.py --config /opt/program-y/bots/servusai/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml`
	`9`	`+python3 /opt/program-y/src/programy/clients/facebook.py --config /opt/program-y/bots/servusai/facebook/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+907201787454730245`
	`2`	`+960241295712284672`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ clear`
`4`	`4`
`5`	`5`	`export PYTHONPATH=../../../src:.`
`6`	`6`
`7`		`-python3 ../../../src/programy/clients/twitter.py --config ./config.yaml --cformat yaml --logging ../../y-bot/logging.yaml`
	`7`	`+python3 ../../../src/programy/clients/twitter.py --config ./config.yaml --cformat yaml --logging ../../y-bot/logging.yaml`