diff --git a/.drone.yml b/.drone.yml index 01a081a..bffb6a5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,15 +12,15 @@ steps: image: appleboy/drone-scp settings: host: - from_secret: ssh_ip + from_secret: server_ip username: - from_secret: ssh_login - password: - from_secret: ssh_pass + from_secret: ssh_user + key: + from_secret: ssh_key port: from_secret: ssh_port target: - - bots/verochka_tg_bot + - deploys/verochka_tg_bot source: - verochka_tg_bot - config @@ -39,21 +39,21 @@ steps: from_secret: ssh_pass settings: host: - from_secret: ssh_ip + from_secret: server_ip username: - from_secret: ssh_login - password: - from_secret: ssh_pass + from_secret: ssh_user + key: + from_secret: ssh_key port: from_secret: ssh_port envs: [ TOKEN,TOKEN_WEATHER,CHAT_ID,PASSWORD ] command_timeout: 10s script: - - cd bots/verochka_tg_bot + - cd deploys/verochka_tg_bot - echo $${TOKEN} > token.txt - echo $${TOKEN_WEATHER} > token_weather.txt - echo $${CHAT_ID} > chat_id.txt - - echo $${PASSWORD} | sudo -S systemctl restart verochka_tg_bot + - echo $${PASSWORD} | sudo -S systemctl restart verochka trigger: event: diff --git a/messages/messages.go b/messages/messages.go index 957b0ad..c9fe3a6 100644 --- a/messages/messages.go +++ b/messages/messages.go @@ -30,7 +30,7 @@ func ThanksMessage() string { } func HelpMessage(chatID int64) string { - return "Вот чем я могу вам помочь (v1.4.3), отправь:\n\n" + + return "Вот чем я могу вам помочь (v1.4.6), отправь:\n\n" + "- /ping отобью pong\n" + "- /today_lessons покажу расписание на сегодня\n" + "- /tomorrow_lessons покажу расписание на завтра\n" + diff --git a/verochka.service b/verochka.service index 16fb4c7..90190dc 100644 --- a/verochka.service +++ b/verochka.service @@ -1,4 +1,4 @@ [Service] -WorkingDirectory=/home/crab/vladimir/verochka_tg_bot -ExecStart=/home/crab/vladimir/verochka_tg_bot/verochka_tg_bot +WorkingDirectory=/home/crab/deploys/verochka_tg_bot +ExecStart=/home/crab/deploys/verochka_tg_bot/verochka_tg_bot Restart=always