Bob Mottram 9 anni fa
parent
commit
9f14fbeb60
2 ha cambiato i file con 15 aggiunte e 0 eliminazioni
  1. 10
    0
      src/freedombone
  2. 5
    0
      src/freedombone-controlpanel

+ 10
- 0
src/freedombone Vedi File

6866
         exit 5846
6866
         exit 5846
6867
     fi
6867
     fi
6868
 
6868
 
6869
+    TOX_ONION_HOSTNAME=$(add_onion_service tox ${TOX_PORT} ${TOX_PORT})
6870
+
6871
+    if ! grep -q "tox onion domain" $COMPLETION_FILE; then
6872
+        echo "tox onion domain:${TOX_ONION_HOSTNAME}" >> $COMPLETION_FILE
6873
+    else
6874
+        sed -i "s|tox onion domain.*|tox onion domain:${TOX_ONION_HOSTNAME}|g" $COMPLETION_FILE
6875
+    fi
6876
+
6869
     systemctl restart tox-bootstrapd.service
6877
     systemctl restart tox-bootstrapd.service
6878
+
6870
     TOX_PUBLIC_KEY=$(cat /var/log/syslog | grep tox | grep "Public Key" | awk -F ' ' '{print $8}' | tail -1)
6879
     TOX_PUBLIC_KEY=$(cat /var/log/syslog | grep tox | grep "Public Key" | awk -F ' ' '{print $8}' | tail -1)
6871
     if [ ${#TOX_PUBLIC_KEY} -lt 30 ]; then
6880
     if [ ${#TOX_PUBLIC_KEY} -lt 30 ]; then
6872
         echo $'Could not obtain the tox node public key'
6881
         echo $'Could not obtain the tox node public key'
6883
         echo '' >> /home/$MY_USERNAME/README
6892
         echo '' >> /home/$MY_USERNAME/README
6884
         echo 'Tox' >> /home/$MY_USERNAME/README
6893
         echo 'Tox' >> /home/$MY_USERNAME/README
6885
         echo '===' >> /home/$MY_USERNAME/README
6894
         echo '===' >> /home/$MY_USERNAME/README
6895
+        echo $"tox onion domain: ${TOX_ONION_HOSTNAME}" >> /home/$MY_USERNAME/README
6886
         echo $"Your Tox node public key is: $TOX_PUBLIC_KEY" >> /home/$MY_USERNAME/README
6896
         echo $"Your Tox node public key is: $TOX_PUBLIC_KEY" >> /home/$MY_USERNAME/README
6887
         echo $'In the Toxic client you can connect to it with:' >> /home/$MY_USERNAME/README
6897
         echo $'In the Toxic client you can connect to it with:' >> /home/$MY_USERNAME/README
6888
         echo "  /connect $DEFAULT_DOMAIN_NAME.local $TOX_PORT $TOX_PUBLIC_KEY" >> /home/$MY_USERNAME/README
6898
         echo "  /connect $DEFAULT_DOMAIN_NAME.local $TOX_PORT $TOX_PUBLIC_KEY" >> /home/$MY_USERNAME/README

+ 5
- 0
src/freedombone-controlpanel Vedi File

163
         echo -n -e "$(pad_string ${DEFAULT_DOMAIN_NAME})"
163
         echo -n -e "$(pad_string ${DEFAULT_DOMAIN_NAME})"
164
         echo "$(cat ${COMPLETION_FILE} | grep 'IRC onion domain' | awk -F ':' '{print $2}')"
164
         echo "$(cat ${COMPLETION_FILE} | grep 'IRC onion domain' | awk -F ':' '{print $2}')"
165
     fi
165
     fi
166
+    if grep -q "tox onion domain" $COMPLETION_FILE; then
167
+        echo -n -e "$(pad_string 'Tox')"
168
+        echo -n -e "$(pad_string ${DEFAULT_DOMAIN_NAME})"
169
+        echo "$(cat ${COMPLETION_FILE} | grep 'tox onion domain' | awk -F ':' '{print $2}')"
170
+    fi
166
     if grep -q "Wiki domain" $COMPLETION_FILE; then
171
     if grep -q "Wiki domain" $COMPLETION_FILE; then
167
         echo -n -e "$(pad_string 'Wiki')"
172
         echo -n -e "$(pad_string 'Wiki')"
168
         WIKIDOM=$(cat ${COMPLETION_FILE} | grep 'Wiki domain' | awk -F ':' '{print $2}')
173
         WIKIDOM=$(cat ${COMPLETION_FILE} | grep 'Wiki domain' | awk -F ':' '{print $2}')