free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Scuttlebot isn't going to work with onion addresses

This commit is contained in:
Bob Mottram 2017-05-23 17:21:32 +01:00
parent 8fa9358e47
commit ccf929e8d0
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/freedombone-app-scuttlebot
View File

@ -37,16 +37,13 @@ SHOW_ICANN_ADDRESS_ON_ABOUT=0
SCUTTLEBOT_VERSION='9.8.0' SCUTTLEBOT_VERSION='9.8.0'
SCUTTLEBOT_PORT=8008 SCUTTLEBOT_PORT=8008
SCUTTLEBOT_ONION_PORT=8118
scuttlebot_variables=(MY_USERNAME scuttlebot_variables=(MY_USERNAME
DEFAULT_DOMAIN_NAME DEFAULT_DOMAIN_NAME
SYSTEM_TYPE) SYSTEM_TYPE)
function scuttlebot_create_invite { function scuttlebot_create_invite {
read_config_param 'DEFAULT_DOMAIN_NAME' invite_string=$(su -c "sbot invite.create 1" - scuttlebot | sed 's/"//g')
SCUTTLEBOT_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_scuttlebot/hostname)
invite_string=$(su -c "sbot invite.create 1" - scuttlebot | sed 's/"//g' | sed "s/$DEFAULT_DOMAIN_NAME/$SCUTTLEBOT_ONION_HOSTNAME/g")
clear clear
echo -e '\n\nYour Scuttlebot invite code is:\n\n'${invite_string}'\n\n' echo -e '\n\nYour Scuttlebot invite code is:\n\n'${invite_string}'\n\n'
@ -168,9 +165,6 @@ function remove_scuttlebot {
systemctl disable scuttlebot systemctl disable scuttlebot
rm /etc/systemd/system/scuttlebot.service rm /etc/systemd/system/scuttlebot.service
function_check remove_onion_service
remove_onion_service scuttlebot ${SCUTTLEBOT_ONION_PORT}
userdel -r scuttlebot userdel -r scuttlebot
if [ -d /etc/scuttlebot ]; then if [ -d /etc/scuttlebot ]; then
@ -227,8 +221,6 @@ function install_scuttlebot {
sleep 3 sleep 3
SCUTTLEBOT_ONION_HOSTNAME=$(add_onion_service scuttlebot ${SCUTTLEBOT_PORT} ${SCUTTLEBOT_ONION_PORT})
if [ ! -d /etc/scuttlebot/.ssb ]; then if [ ! -d /etc/scuttlebot/.ssb ]; then
echo $'Scuttlebot config not generated' echo $'Scuttlebot config not generated'
exit 73528 exit 73528