Skip to content
Snippets Groups Projects
Commit 3753e170 authored by Bob Mottram's avatar Bob Mottram
Browse files

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

parent c48ff549
No related branches found
No related tags found
No related merge requests found
......@@ -8502,7 +8502,7 @@ function install_watchdog_script {
}
 
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
fi
if grep -Fxq "install_irc_server" $COMPLETION_FILE; then
......
......@@ -28,12 +28,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
IRSSI_PATH=/usr/bin/irssi
MUMBLE_PATH=/usr/bin/mumble
TOXIC_PATH=/usr/bin/toxic
DHTNODES=/usr/share/toxic/DHTnodes
IRC_PORT=6697
PEERS_FILE=/tmp/meshpeers.txt
TOX_PORT=33445
......@@ -245,7 +243,6 @@ if [[ $SERVER_INSTALLATION == "no" ]]; then
if [ ! -f /tmp/meshtype ]; then
install_toxcore
install_toxid
install_zeronet
sudo batman start
if [ ! "$?" = "0" ]; then
exit 2
......@@ -312,47 +309,27 @@ if [ ! $AVAHI_DOMAIN ]; then
fi
# if only mumble is installed
if [ ! -f $IRSSI_PATH ]; then
if [ ! -f $TOXIC_PATH ]; then
if [ -f $MUMBLE_PATH ]; then
$MUMBLE_PATH &
exit 0
fi
echo 'You need irssi/mumble/toxic installed on your system'
if [[ $SERVER_INSTALLATION == "no" ]]; then
sudo batman stop
fi
exit 4
if [ ! -f $TOXIC_PATH ]; then
if [ -f $MUMBLE_PATH ]; then
$MUMBLE_PATH &
exit 0
fi
fi
# if only irssi is installed
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
echo 'You need mumble/toxic/qTox installed on your system'
if [[ $SERVER_INSTALLATION == "no" ]]; then
sudo batman stop
fi
exit 4
fi
# if only tox is installed
if [ ! -f $MUMBLE_PATH ]; then
if [ ! -f $IRSSI_PATH ]; then
run_tox
fi
run_tox
fi
echo ''
echo 'Choose communication service:'
echo ' 1. VoIP'
echo ' 2. Tox Chat'
echo ' 3. IRC (WARNING: not secure)'
echo ''
read peer_index
......@@ -387,10 +364,4 @@ if [[ $peer_index == 2 ]]; then
run_tox
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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment