mirror of
https://github.com/octoleo/telegram-bot-bash.git
synced 2024-11-11 03:50:54 +00:00
resolve conflicts with master
This commit is contained in:
commit
4ce19b1b04
43
README.md
43
README.md
@ -386,31 +386,48 @@ E.g. the Emoticons ``` 😁 😘 ❤️ 😊 👍 ``` are encoded as:
|
|||||||
Bashbot is desingned to run manually by the user who installed it. Nevertheless it's possible to run it by an other user-ID, as a system service or sceduled from cron. This is onyl recommended for experiend linux users.
|
Bashbot is desingned to run manually by the user who installed it. Nevertheless it's possible to run it by an other user-ID, as a system service or sceduled from cron. This is onyl recommended for experiend linux users.
|
||||||
|
|
||||||
### Run as other user or system service
|
### Run as other user or system service
|
||||||
Running bashbot as an other user is only possible (and strongly recommended) for root.
|
Running bashbot as an other user is only possible with sudo rigths.
|
||||||
|
|
||||||
Setup the environment for the user you want to run bashbot and enter new username:
|
Setup the environment for the user you want to run bashbot and enter desired username, e.g. nobody :
|
||||||
```bash
|
```bash
|
||||||
./bashbot.sh init
|
sudo ./bashbot.sh init
|
||||||
```
|
```
|
||||||
|
|
||||||
Edit the example rc file ```bashbot.rc```, uncomment the ```runcmd``` availible on your system and fill the name of your Bot in ```name```.
|
Edit the file ```bashbot.rc``` and edit the following lines to fit your configuration:
|
||||||
|
```bash
|
||||||
|
#######################
|
||||||
|
# Configuration Section
|
||||||
|
|
||||||
|
# edit the next line to fit the user you want to run bashbot, e.g. nobody:
|
||||||
|
runas="nobody"
|
||||||
|
|
||||||
|
# uncomment one of the following lines
|
||||||
|
# runcmd="su $runas -s /bin/bash -c " # runasuser with su
|
||||||
|
# runcmd="runuser $runas -s /bin/bash -c " # runasuser with runuser
|
||||||
|
|
||||||
|
# edit the values of the following lines to fit your config:
|
||||||
|
start="/usr/local/telegram-bot-bash/bashbot.sh" # location of your bashbot.sh script
|
||||||
|
name='' # your bot name as given to botfather, e.g. mysomething_bot
|
||||||
|
|
||||||
|
# END Configuration
|
||||||
|
#######################
|
||||||
|
```
|
||||||
From now on always use bashbot.rc to start/stop your bot:
|
From now on always use bashbot.rc to start/stop your bot:
|
||||||
```bash
|
```bash
|
||||||
./bashbot.rc start
|
sudo ./bashbot.rc start
|
||||||
```
|
```
|
||||||
Type ```ps -ef | grep bashbot``` to verify your Bot is running as the desired user.
|
Type ```ps -ef | grep bashbot``` to verify your Bot is running as the desired user.
|
||||||
|
|
||||||
If you started bashbot by bashbot.rc you must use bashbot.rc also to manage your Bot! The following commands are availible:
|
If you started bashbot by bashbot.rc you must use bashbot.rc also to manage your Bot! The following commands are availible:
|
||||||
```bash
|
```bash
|
||||||
./bashbot.rc start
|
sudo ./bashbot.rc start
|
||||||
./bashbot.rc stop
|
sudo ./bashbot.rc stop
|
||||||
./bashbot.rc status
|
sudo ./bashbot.rc status
|
||||||
./bashbot.rc suspendback
|
sudo ./bashbot.rc suspendback
|
||||||
./bashbot.rc resumeback
|
sudo ./bashbot.rc resumeback
|
||||||
./bashbot.rc killback
|
sudo ./bashbot.rc killback
|
||||||
```
|
```
|
||||||
To change back the environment to your user-ID run ```./bashbot.rc init``` again and enter your user name.
|
To change back the environment to your user-ID run ```sudo ./bashbot.sh init``` again and enter your user name.
|
||||||
|
|
||||||
To use bashbot as a system servive include a working ```bashbot.rc``` in your init system (systemd, /etc/init.d).
|
To use bashbot as a system servive include a working ```bashbot.rc``` in your init system (systemd, /etc/init.d).
|
||||||
|
|
||||||
@ -438,7 +455,7 @@ Never run your Bot as root, this is the most dangerous you can do! Usually the u
|
|||||||
### Secure your Bot installation
|
### Secure your Bot installation
|
||||||
Everyone who can read your Bot files can extract your Bots data. Especially your Bot Token in ```token``` must be protected against other users. No one exept you should have write access to the Bot files. The Bot itself need write access to ```count``` and ```tmp-bot-bash``` only, all other files should be write protected.
|
Everyone who can read your Bot files can extract your Bots data. Especially your Bot Token in ```token``` must be protected against other users. No one exept you should have write access to the Bot files. The Bot itself need write access to ```count``` and ```tmp-bot-bash``` only, all other files should be write protected.
|
||||||
|
|
||||||
Runing ```./bashbot init``` sets the Bot permissions to reasonable default values as a starting point.
|
Runing ```./bashbot.sh init``` sets the Bot permissions to reasonable default values as a starting point.
|
||||||
|
|
||||||
### Is this Bot insecure?
|
### Is this Bot insecure?
|
||||||
No - its not less (in)secure as any other Bot written in any other language. But you should know about the implications ...
|
No - its not less (in)secure as any other Bot written in any other language. But you should know about the implications ...
|
||||||
|
33
bashbot.rc
33
bashbot.rc
@ -15,21 +15,30 @@
|
|||||||
# Description: Start or stop telegram-bot-bash server
|
# Description: Start or stop telegram-bot-bash server
|
||||||
### END INIT INFO
|
### END INIT INFO
|
||||||
|
|
||||||
runas="root" # not recommended!
|
# save default values
|
||||||
|
TERM="" # disable bashbot clear and color output
|
||||||
|
runas="nobody" # not recommended!
|
||||||
runcmd="echo Dry run:" # not actived until you edit lines below
|
runcmd="echo Dry run:" # not actived until you edit lines below
|
||||||
|
|
||||||
# uncomment the next line to run as other user, e.g. www
|
#######################
|
||||||
# runas="nobody"
|
# Configuration Section
|
||||||
|
|
||||||
# uncomment one of the following lines
|
# edit the next line to fit the user you want to run bashbot, e.g. nobody:
|
||||||
# runcmd="su $runas -s /bin/bash -c " # runasuser with su
|
runas="nobody"
|
||||||
# runcmd="runuser $runas -s /bin/bash -c " # runasuser with runuser
|
|
||||||
|
|
||||||
# adjust the the values of the following lines
|
# uncomment one of the following lines to fit your system
|
||||||
start="/usr/local/telegram-bot-bash/bashbot.sh"
|
# runcmd="su $runas -s /bin/bash -c " # runasuser with *su*
|
||||||
lockfile=/usr/local/telegram-bot-bash/lockfile
|
# runcmd="runuser $runas -s /bin/bash -c " # runasuser with *runuser*
|
||||||
name='new-session' # telegram name of your bot
|
|
||||||
|
|
||||||
|
# edit the values of the following lines to fit your config:
|
||||||
|
start="/usr/local/telegram-bot-bash/bashbot.sh" # location of your bashbot.sh script
|
||||||
|
name='' # your bot name as given to botfather, e.g. mysomething_bot
|
||||||
|
|
||||||
|
# END Configuration
|
||||||
|
#######################
|
||||||
|
|
||||||
|
lockfile="$(dirname $start)/lockfile"
|
||||||
|
[ "$name" = "" ] && name="$runas"
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
'start')
|
'start')
|
||||||
@ -49,10 +58,10 @@ case "$1" in
|
|||||||
'status')
|
'status')
|
||||||
ps -f -u "$runas" | grep "$name" | grep -qF "bashbot.sh startbot"
|
ps -f -u "$runas" | grep "$name" | grep -qF "bashbot.sh startbot"
|
||||||
if [ "$?" = "0" ]; then
|
if [ "$?" = "0" ]; then
|
||||||
echo "$name is running"
|
echo "bashbot ($name) is running"
|
||||||
RETVAL=0
|
RETVAL=0
|
||||||
else
|
else
|
||||||
echo "$name is stopped"
|
echo "bashbot ($name) is stopped"
|
||||||
RETVAL=1
|
RETVAL=1
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
@ -539,6 +539,7 @@ case "$1" in
|
|||||||
;;
|
;;
|
||||||
"count")
|
"count")
|
||||||
echo "A total of $(wc -l <"${COUNT}") users used me."
|
echo "A total of $(wc -l <"${COUNT}") users used me."
|
||||||
|
exit
|
||||||
;;
|
;;
|
||||||
"broadcast")
|
"broadcast")
|
||||||
NUMCOUNT="$(wc -l <"${COUNT}")"
|
NUMCOUNT="$(wc -l <"${COUNT}")"
|
||||||
|
Loading…
Reference in New Issue
Block a user