From c11d7f1924beb45f133f46dbb9ec2aaf26f7d5d1 Mon Sep 17 00:00:00 2001 From: user-penguin Date: Wed, 8 Mar 2023 15:35:35 +0700 Subject: [PATCH 1/7] edit drone.yml --- .drone.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 01a081a..a7c9f6c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,11 +12,11 @@ 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: @@ -39,11 +39,11 @@ 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 ] From 4e2db0fafbd6ee676cc31e90270f476d0fb71c1e Mon Sep 17 00:00:00 2001 From: user-penguin Date: Wed, 8 Mar 2023 15:40:53 +0700 Subject: [PATCH 2/7] edit bot deploy path --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index a7c9f6c..4a8cc43 100644 --- a/.drone.yml +++ b/.drone.yml @@ -49,7 +49,7 @@ steps: envs: [ TOKEN,TOKEN_WEATHER,CHAT_ID,PASSWORD ] command_timeout: 10s script: - - cd bots/verochka_tg_bot + - cd deploys/bots/verochka_tg_bot - echo $${TOKEN} > token.txt - echo $${TOKEN_WEATHER} > token_weather.txt - echo $${CHAT_ID} > chat_id.txt From dc2c3bfee4343c9920a0cdd9ffa3dcb1c928f2db Mon Sep 17 00:00:00 2001 From: user-penguin Date: Wed, 8 Mar 2023 15:42:22 +0700 Subject: [PATCH 3/7] fix --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4a8cc43..4f627aa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -53,7 +53,7 @@ steps: - 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: From c0dae8b8a34ef45c6b0b51ad603ec6aad4969d11 Mon Sep 17 00:00:00 2001 From: user-penguin Date: Wed, 8 Mar 2023 15:43:57 +0700 Subject: [PATCH 4/7] ver. up --- messages/messages.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/messages/messages.go b/messages/messages.go index 957b0ad..d134572 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.4), отправь:\n\n" + "- /ping отобью pong\n" + "- /today_lessons покажу расписание на сегодня\n" + "- /tomorrow_lessons покажу расписание на завтра\n" + From 60fbf7c214b32f36d054262e5870d78ff39d5037 Mon Sep 17 00:00:00 2001 From: user-penguin Date: Wed, 8 Mar 2023 15:46:47 +0700 Subject: [PATCH 5/7] ver. up --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4f627aa..768a7bc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,7 +20,7 @@ steps: port: from_secret: ssh_port target: - - bots/verochka_tg_bot + - deploys/bots/verochka_tg_bot source: - verochka_tg_bot - config From 3e61a8a3c29293f9a9ead0970f97c9fe3d54c396 Mon Sep 17 00:00:00 2001 From: user-penguin Date: Wed, 8 Mar 2023 15:54:55 +0700 Subject: [PATCH 6/7] ver. up --- .drone.yml | 4 ++-- messages/messages.go | 2 +- verochka.service | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 768a7bc..bffb6a5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,7 +20,7 @@ steps: port: from_secret: ssh_port target: - - deploys/bots/verochka_tg_bot + - deploys/verochka_tg_bot source: - verochka_tg_bot - config @@ -49,7 +49,7 @@ steps: envs: [ TOKEN,TOKEN_WEATHER,CHAT_ID,PASSWORD ] command_timeout: 10s script: - - cd deploys/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 diff --git a/messages/messages.go b/messages/messages.go index d134572..4e4e4c3 100644 --- a/messages/messages.go +++ b/messages/messages.go @@ -30,7 +30,7 @@ func ThanksMessage() string { } func HelpMessage(chatID int64) string { - return "Вот чем я могу вам помочь (v1.4.4), отправь:\n\n" + + return "Вот чем я могу вам помочь (v1.4.5), отправь:\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 From 9aae4d2f23e18f4cbc405d38638db6fc85107cb7 Mon Sep 17 00:00:00 2001 From: user-penguin Date: Wed, 8 Mar 2023 15:55:54 +0700 Subject: [PATCH 7/7] ver. up --- messages/messages.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/messages/messages.go b/messages/messages.go index 4e4e4c3..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.5), отправь:\n\n" + + return "Вот чем я могу вам помочь (v1.4.6), отправь:\n\n" + "- /ping отобью pong\n" + "- /today_lessons покажу расписание на сегодня\n" + "- /tomorrow_lessons покажу расписание на завтра\n" +