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

Remove IRC from mesh install, since it doesn't seem easy to secure

This commit is contained in:
Bob Mottram 2015-08-31 16:22:01 +01:00
parent c48ff54991
commit 3753e17055
2 changed files with 10 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone
View File

@ -8502,7 +8502,7 @@ function install_watchdog_script {
} }
function install_irc_server { function install_irc_server {
if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
return return
fi fi
if grep -Fxq "install_irc_server" $COMPLETION_FILE; then if grep -Fxq "install_irc_server" $COMPLETION_FILE; then

47
src/freedombone-mesh
View File

@ -28,12 +28,10 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
IRSSI_PATH=/usr/bin/irssi
MUMBLE_PATH=/usr/bin/mumble MUMBLE_PATH=/usr/bin/mumble
TOXIC_PATH=/usr/bin/toxic TOXIC_PATH=/usr/bin/toxic
DHTNODES=/usr/share/toxic/DHTnodes DHTNODES=/usr/share/toxic/DHTnodes
IRC_PORT=6697
PEERS_FILE=/tmp/meshpeers.txt PEERS_FILE=/tmp/meshpeers.txt
TOX_PORT=33445 TOX_PORT=33445
@ -245,7 +243,6 @@ if [[ $SERVER_INSTALLATION == "no" ]]; then
if [ ! -f /tmp/meshtype ]; then if [ ! -f /tmp/meshtype ]; then
install_toxcore install_toxcore
install_toxid install_toxid
install_zeronet
sudo batman start sudo batman start
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
exit 2 exit 2
@ -312,47 +309,27 @@ if [ ! $AVAHI_DOMAIN ]; then
fi fi
# if only mumble is installed # if only mumble is installed
if [ ! -f $IRSSI_PATH ]; then if [ ! -f $TOXIC_PATH ]; then
if [ ! -f $TOXIC_PATH ]; then if [ -f $MUMBLE_PATH ]; then
if [ -f $MUMBLE_PATH ]; then $MUMBLE_PATH &
$MUMBLE_PATH & exit 0
exit 0
fi
echo 'You need irssi/mumble/toxic installed on your system'
if [[ $SERVER_INSTALLATION == "no" ]]; then
sudo batman stop
fi
exit 4
fi fi
fi echo 'You need mumble/toxic/qTox installed on your system'
if [[ $SERVER_INSTALLATION == "no" ]]; then
# if only irssi is installed sudo batman stop
if [ ! -f $MUMBLE_PATH ]; then
if [ ! -f $TOXIC_PATH ]; then
if [ -f $IRSSI_PATH ]; then
$IRSSI_PATH -c $AVAHI_DOMAIN -p $IRC_PORT -n $USER
exit 0
fi
echo 'You need irssi/mumble/toxic installed on your system'
if [[ $SERVER_INSTALLATION == "no" ]]; then
sudo batman stop
fi
exit 4
fi fi
exit 4
fi fi
# if only tox is installed # if only tox is installed
if [ ! -f $MUMBLE_PATH ]; then if [ ! -f $MUMBLE_PATH ]; then
if [ ! -f $IRSSI_PATH ]; then run_tox
run_tox
fi
fi fi
echo '' echo ''
echo 'Choose communication service:' echo 'Choose communication service:'
echo ' 1. VoIP' echo ' 1. VoIP'
echo ' 2. Tox Chat' echo ' 2. Tox Chat'
echo ' 3. IRC (WARNING: not secure)'
echo '' echo ''
read peer_index read peer_index
@ -387,10 +364,4 @@ if [[ $peer_index == 2 ]]; then
run_tox run_tox
fi fi
if [[ $peer_index == 3 ]]; then
if [ -f $IRSSI_PATH ]; then
$IRSSI_PATH -c $AVAHI_DOMAIN -p $IRC_PORT -n $USER
fi
fi
exit 0 exit 0