Merge branch 'deploy/cicd'

added Dockerfile and docker-compose.yaml with krakend api gateway and
monitoring using influxdb and grafana dashboard

1 files changed, 6 insertions, 5 deletions

diff --git a/config.py b/config.py
index 0fae9b1..fe69bd9 100644
--- a/config.py
+++ b/config.py
@@ -10,6 +10,12 @@ BOT_TOKEN = config["DEFAULT"]["BOT_TOKEN"]
 FSQ_API_KEY = config["DEFAULT"]["FOURSQUARE_API_KEY"]
 ENCRYPT_KEY = config["DEFAULT"]["ENCRYPT_KEY"]
 
+TELEGRAM_WEBHOOK_URL = config["API"]["TELEGRAM_WEBHOOK_URL"]
+HEALTHCHECK_URL = config["API"]["HEALTHCHECK_URL"]
+FEDI_LOGIN_CALLBACK_URL = config["API"]["FEDI_LOGIN_CALLBACK_URL"]
+BOT_DOMAIN = config["API"]["BOT_DOMAIN"]
+BOT_PORT = int(config["API"]["BOT_PORT"])
+
 MEDIA_GROUP_TIMEOUT = 3
 
 FEDI_LOGIN, WAIT_VISIBILITY, WAIT_LOCATION, LOCATION_SEARCH_KEYWORD, LOCATION_CONFIRMATION, ADD_MEDIA, ADD_COMMENT = range(7)
@@ -41,9 +47,4 @@ class MsgDict(TypedDict):
 KEY_TOOT_STATUS_ID = "toot_status_id"
 KEY_TOOT_STATUS_CONTENT = "toot_status_content"
 
-TELEGRAM_WEBHOOK_URL = "/checkinbot/webhook"
-HEALTHCHECK_URL = "/checkinbot/healthcheck"
-FEDI_LOGIN_CALLBACK_URL = "/checkinbot/fedi_login_callback"
-BOT_DOMAIN = "https://zjw.social"
-BOT_PORT = 30010
 BOT_SCOPE = ['read:accounts', 'write:media', 'write:statuses']