From 9cf8113211a7cca19e0b13b512fc9e44f506297c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Thu, 13 Oct 2016 20:20:57 +0100
Subject: [PATCH] Remove cjdns and babel
In the current mesh implementation they're unused
---
src/freedombone | 10 -
src/freedombone-app-babel | 117 --------
src/freedombone-app-cjdns | 550 -----------------------------------
src/freedombone-config | 2 -
src/freedombone-controlpanel | 22 +-
src/freedombone-image | 2 -
src/freedombone-mesh-install | 272 +++--------------
src/freedombone-utils-avahi | 2 +-
src/freedombone-utils-config | 2 -
src/freedombone-utils-help | 1 -
src/freedombone-utils-wifi | 2 +-
11 files changed, 46 insertions(+), 936 deletions(-)
delete mode 100755 src/freedombone-app-babel
delete mode 100755 src/freedombone-app-cjdns
diff --git a/src/freedombone b/src/freedombone
index 1781e44a5..c5ab3fd08 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -184,21 +184,11 @@ else
shift
USB_DRIVE=$1
;;
- # Enable CJDNS
- --cjdns)
- shift
- ENABLE_CJDNS="yes"
- ;;
# Enable B.A.T.M.A.N
--batman)
shift
ENABLE_BATMAN="yes"
;;
- # Enable Babel
- --babel)
- shift
- ENABLE_BABEL="yes"
- ;;
# Mumble server password
--vpass)
shift
diff --git a/src/freedombone-app-babel b/src/freedombone-app-babel
deleted file mode 100755
index 5282c746b..000000000
--- a/src/freedombone-app-babel
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/bash
-#
-# .---. . .
-# | | |
-# |--- .--. .-. .-. .-.| .-. .--.--. |.-. .-. .--. .-.
-# | | (.-' (.-' ( | ( )| | | | )( )| | (.-'
-# ' ' --' --' -' - -' ' ' -' -' -' ' - --'
-#
-# Freedom in the Cloud
-#
-# Babel mesh functions
-#
-# License
-# =======
-#
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-VARIANTS=''
-
-ENABLE_BABEL="no"
-BABEL_PORT=6696
-
-babel_variables=()
-
-function install_interactive_babel {
- echo -n ''
- APP_INSTALLED=1
-}
-
-function change_password_babel {
- echo -n ''
-}
-
-function reconfigure_babel {
- echo -n ''
-}
-
-function upgrade_babel {
- echo -n ''
-}
-
-function backup_local_babel {
- echo -n ''
-}
-
-function restore_local_babel {
- echo -n ''
-}
-
-function backup_remote_babel {
- echo -n ''
-}
-
-function restore_remote_babel {
- echo -n ''
-}
-
-function remove_babel {
- ${PROJECT_NAME}-mesh-install -f babel --remove yes
- if [ ! "$?" = "0" ]; then
- echo $'Failed to remove babel'
- exit 83658
- fi
-
- iptables -D INPUT -i $WIFI_INTERFACE -p udp --dport $BABEL_PORT -j ACCEPT
- function_check save_firewall_settings
- save_firewall_settings
-
- sed -i '/install_babel/d' $COMPLETION_FILE
- sed -i '/configure_firewall_for_babel/d' $COMPLETION_FILE
-}
-
-function configure_firewall_for_babel {
- if grep -Fxq "configure_firewall_for_babel" $COMPLETION_FILE; then
- return
- fi
- if [[ $ENABLE_BABEL != "yes" ]]; then
- return
- fi
- iptables -A INPUT -i $WIFI_INTERFACE -p udp --dport $BABEL_PORT -j ACCEPT
- function_check save_firewall_settings
- save_firewall_settings
-
- OPEN_PORTS+=("Babel $BABEL_PORT")
- echo 'configure_firewall_for_babel' >> $COMPLETION_FILE
-}
-
-function install_babel {
- if [[ $ENABLE_BABEL != "yes" ]]; then
- return
- fi
-
- ${PROJECT_NAME}-mesh-install -f babel
- if [ ! "$?" = "0" ]; then
- echo $'Failed to install babel'
- exit 67242
- fi
-
- function_check configure_firewall_for_babel
- configure_firewall_for_babel
- APP_INSTALLED=1
-}
-
-# NOTE: deliberately there is no "exit 0"
diff --git a/src/freedombone-app-cjdns b/src/freedombone-app-cjdns
deleted file mode 100755
index 58436ad42..000000000
--- a/src/freedombone-app-cjdns
+++ /dev/null
@@ -1,550 +0,0 @@
-#!/bin/bash
-#
-# .---. . .
-# | | |
-# |--- .--. .-. .-. .-.| .-. .--.--. |.-. .-. .--. .-.
-# | | (.-' (.-' ( | ( )| | | | )( )| | (.-'
-# ' ' --' --' -' - -' ' ' -' -' -' ' - --'
-#
-# Freedom in the Cloud
-#
-# cjdns functions
-#
-# License
-# =======
-#
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-VARIANTS=''
-
-ENABLE_CJDNS="no"
-CJDNS_PRIVATE_KEY=
-CJDNS_PUBLIC_KEY=
-CJDNS_IPV6=
-CJDNS_PASSWORD=
-CJDNS_PORT=
-CJDNS_REPO="https://github.com/cjdelisle/cjdns.git"
-CJDNS_COMMIT='13189fde111d0500427a7a0ce06a970753527bca'
-CJDCMD_REPO="https://github.com/inhies/cjdcmd"
-CJDCMD_COMMIT='973cca6ed0eecf9041c3403a40193c0b1291b808'
-
-cjdns_variables=(MY_USERNAME
- CJDNS_PORT
- CJDNS_REPO
- CJDNS_COMMIT
- CJDCMD_REPO
- CJDCMD_COMMIT
- CJDNS_IPV6
- CJDNS_PUBLIC_KEY
- CJDNS_PRIVATE_KEY)
-
-function install_interactive_cjdns {
- echo -n ''
- APP_INSTALLED=1
-}
-
-function change_password_cjdns {
- echo -n ''
-}
-
-function reconfigure_cjdns {
- echo -n ''
-}
-
-function upgrade_cjdns {
- if ! grep -Fxq "install_cjdns" $COMPLETION_FILE; then
- return
- fi
- function_check set_repo_commit
- set_repo_commit /etc/cjdns "cjdns commit" "$CJDNS_COMMIT" $CJDNS_REPO
-}
-
-function configure_firewall_for_cjdns {
- if grep -Fxq "configure_firewall_for_cjdns" $COMPLETION_FILE; then
- return
- fi
- if [[ $ENABLE_CJDNS != "yes" ]]; then
- return
- fi
- ip6tables -t nat -A POSTROUTING -o tun0 -j MASQUERADE
- ip6tables -A FORWARD -i tun0 -o eth0 -m state --state RELATED,ESTABLISHED -j ACCEPT
- ip6tables -A INPUT -p udp --dport $CJDNS_PORT -j ACCEPT
- ip6tables -A INPUT -p tcp --dport $CJDNS_PORT -j ACCEPT
-
- function_check save_firewall_settings
- save_firewall_settings
- echo 'configure_firewall_for_cjdns' >> $COMPLETION_FILE
-}
-
-function get_cjdns_public_key {
- if [ -f /home/$MY_USERNAME/README ]; then
- if grep -q "cjdns public key" /home/$MY_USERNAME/README; then
- if [ ! $CJDNS_PUBLIC_KEY ]; then
- CJDNS_PUBLIC_KEY=$(cat /home/$MY_USERNAME/README | grep "cjdns public key" | awk -F ':' '{print $2}' | sed 's/^ *//')
- fi
- fi
- fi
-}
-
-function get_cjdns_private_key {
- if [ -f /home/$MY_USERNAME/README ]; then
- if grep -q "cjdns private key" /home/$MY_USERNAME/README; then
- if [ ! $CJDNS_PRIVATE_KEY ]; then
- CJDNS_PRIVATE_KEY=$(cat /home/$MY_USERNAME/README | grep "cjdns private key" | awk -F ':' '{print $2}' | sed 's/^ *//')
- fi
- fi
- fi
-}
-
-function get_cjdns_ipv6_address {
- if [ -f /home/$MY_USERNAME/README ]; then
- if grep -q "cjdns IPv6 address" /home/$MY_USERNAME/README; then
- if [ ! $CJDNS_IPV6 ]; then
- CJDNS_IPV6=$(cat /home/$MY_USERNAME/README | grep "cjdns IPv6 address" | awk -F ':' '{print $2}' | sed 's/^ *//')
- fi
- fi
- fi
-}
-
-function get_cjdns_port {
- if [ -f /home/$MY_USERNAME/README ]; then
- if grep -q "cjdns port" /home/$MY_USERNAME/README; then
- if [ ! $CJDNS_PORT ]; then
- CJDNS_PORT=$(cat /home/$MY_USERNAME/README | grep "cjdns port" | awk -F ':' '{print $2}' | sed 's/^ *//')
- fi
- fi
- fi
-}
-
-function get_cjdns_password {
- if [ -f /home/$MY_USERNAME/README ]; then
- if grep -q "cjdns password" /home/$MY_USERNAME/README; then
- if [ ! $CJDNS_PASSWORD ]; then
- CJDNS_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "cjdns password" | awk -F ':' '{print $2}' | sed 's/^ *//')
- fi
- fi
- fi
-}
-
-function backup_local_cjdns {
- echo -n ''
-}
-
-function restore_local_cjdns {
- if [ -d $USB_MOUNT/backup/cjdns ]; then
- echo $"Restoring cjdns installation"
- temp_restore_dir=/root/tempcjdns
- function_check restore_directory_from_usb
- restore_directory_from_usb $temp_restore_dir cjdns
- rm -rf /etc/cjdns
- cp -r $temp_restore_dir/etc/cjdns /etc/
- if [ ! "$?" = "0" ]; then
- function_check set_user_permissions
- set_user_permissions
- function_check backup_unmount_drive
- backup_unmount_drive
- exit 8472
- fi
- rm -rf $temp_restore_dir
- fi
-}
-
-function backup_remote_cjdns {
- echo -n ''
-}
-
-function restore_remote_cjdns {
- if [ -d $SERVER_DIRECTORY/backup/cjdns ]; then
- echo $"Restoring cjdns installation"
- temp_restore_dir=/root/tempcjdns
- function_check restore_directory_from_friend
- restore_directory_from_friend $temp_restore_dir cjdns
- rm -rf /etc/cjdns
- cp -r $temp_restore_dir/etc/cjdns /etc/
- if [ ! "$?" = "0" ]; then
- exit 7438
- fi
- rm -rf $temp_restore_dir
- fi
-}
-
-function remove_cjdns {
- service cjdns stop
- ip6tables -D nat -D POSTROUTING -o tun0 -j MASQUERADE
- ip6tables -D FORWARD -i tun0 -o eth0 -m state --state RELATED,ESTABLISHED -j ACCEPT
- ip6tables -D INPUT -p udp --dport $CJDNS_PORT -j ACCEPT
- ip6tables -D INPUT -p tcp --dport $CJDNS_PORT -j ACCEPT
- function_check save_firewall_settings
- save_firewall_settings
-
- rm -rf /etc/cjdns
- sed -i '/install_cjdns/d' $COMPLETION_FILE
- sed -i '/cjdns /d' $COMPLETION_FILE
- sed -i '/configure_firewall_for_cjdns/d' $COMPLETION_FILE
-}
-
-function install_cjdns_main {
- if [[ $ENABLE_CJDNS != "yes" ]]; then
- return
- fi
-
- if grep -Fxq "install_cjdns_main" $COMPLETION_FILE; then
- return
- fi
-
- apt-get -y install nodejs git build-essential nmap
-
- # if a README exists then obtain the cjdns parameters
- function_check get_cjdns_ipv6_address
- get_cjdns_ipv6_address
-
- function_check get_cjdns_public_key
- get_cjdns_public_key
-
- function_check get_cjdns_private_key
- get_cjdns_private_key
-
- function_check get_cjdns_port
- get_cjdns_port
-
- function_check get_cjdns_password
- get_cjdns_password
-
- # special compile settings for running ./do on the Beaglebone Black
- if [[ $INSTALLING_ON_BBB == "yes" ]]; then
- CFLAGS="-O2 -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -ffast-math -mfloat-abi=hard -marm -Wno-error=maybe-uninitialized"
- export LDFLAGS="$CFLAGS"
- fi
-
- if [ ! -d /etc/cjdns ]; then
- function_check git_pull
- git_clone $CJDNS_REPO /etc/cjdns
- cd /etc/cjdns
-
- git checkout $CJDNS_COMMIT -b $CJDNS_COMMIT
- if ! grep -q "cjdns commit" $COMPLETION_FILE; then
- echo "cjdns commit:$CJDNS_COMMIT" >> $COMPLETION_FILE
- else
- sed -i "s/cjdns commit.*/cjdns commit:$CJDNS_COMMIT/g" $COMPLETION_FILE
- fi
-
- ./do
- if [ ! "$?" = "0" ]; then
- exit 7439
- fi
- # create a configuration
- if [ ! -f /etc/cjdns/cjdroute.conf ]; then
- ./cjdroute --genconf > /etc/cjdns/cjdroute.conf
- if [ ! "$?" = "0" ]; then
- exit 5922
- fi
- fi
- # create a user to run as
- useradd cjdns
- else
- cd /etc/cjdns
- function_check git_pull
- git_pull $CJDNS_REPO
- ./do
- if [ ! "$?" = "0" ]; then
- exit 9926
- fi
- fi
-
- # set permissions
- chown -R cjdns:cjdns /etc/cjdns
- chmod 600 /etc/cjdns/cjdroute.conf
-
- /sbin/ip tuntap add mode tun user cjdns dev cjdroute0
-
- # insert values into the configuration file
- if [ $CJDNS_PRIVATE_KEY ]; then
- sed -i "s/\"privateKey\":.*/\"privateKey\": \"$CJDNS_PRIVATE_KEY\",/g" /etc/cjdns/cjdroute.conf
- else
- CJDNS_PRIVATE_KEY=$(cat /etc/cjdns/cjdroute.conf | grep '"privateKey"' | awk -F '"' '{print $4}' | sed -n 1p)
- fi
- if [ $CJDNS_PUBLIC_KEY ]; then
- sed -i "s/\"publicKey\":.*/\"publicKey\": \"$CJDNS_PUBLIC_KEY\",/g" /etc/cjdns/cjdroute.conf
- else
- CJDNS_PUBLIC_KEY=$(cat /etc/cjdns/cjdroute.conf | grep '"publicKey"' | awk -F '"' '{print $4}' | sed -n 1p)
- fi
- if [ $CJDNS_IPV6 ]; then
- sed -i "s/\"ipv6\":.*/\"ipv6\": \"$CJDNS_IPV6\",/g" /etc/cjdns/cjdroute.conf
- else
- CJDNS_IPV6=$(cat /etc/cjdns/cjdroute.conf | grep '"ipv6"' | awk -F '"' '{print $4}' | sed -n 1p)
- fi
- if [ $CJDNS_PASSWORD ]; then
- sed -i "0,/{\"password\":.*/s//{\"password\": \"$CJDNS_PASSWORD\"}/g" /etc/cjdns/cjdroute.conf
- else
- CJDNS_PASSWORD=$(cat /etc/cjdns/cjdroute.conf | grep '"password"' | awk -F '"' '{print $4}' | sed -n 1p)
- fi
- if [ $CJDNS_PORT ]; then
- sed -i "s/\"bind\": \"0.0.0.0:.*/\"bind\": \"0.0.0.0:$CJDNS_PORT\",/g" /etc/cjdns/cjdroute.conf
- else
- CJDNS_PORT=$(cat /etc/cjdns/cjdroute.conf | grep '"bind": "0.0.0.0:' | awk -F '"' '{print $4}' | awk -F ':' '{print $2}' | sed -n 1p)
- fi
-
- function_check enable_ipv6
- enable_ipv6
-
- echo '#!/bin/sh -e' > /etc/init.d/cjdns
- echo '### BEGIN INIT INFO' >> /etc/init.d/cjdns
- echo '# hyperboria.sh - An init script (/etc/init.d/) for cjdns' >> /etc/init.d/cjdns
- echo '# Provides: cjdroute' >> /etc/init.d/cjdns
- echo '# Required-Start: $remote_fs $network' >> /etc/init.d/cjdns
- echo '# Required-Stop: $remote_fs $network' >> /etc/init.d/cjdns
- echo '# Default-Start: 2 3 4 5' >> /etc/init.d/cjdns
- echo '# Default-Stop: 0 1 6' >> /etc/init.d/cjdns
- echo '# Short-Description: Cjdns router' >> /etc/init.d/cjdns
- echo '# Description: A routing engine designed for security, scalability, speed and ease of use.' >> /etc/init.d/cjdns
- echo '# cjdns git repo: https://github.com/cjdelisle/cjdns/' >> /etc/init.d/cjdns
- echo '### END INIT INFO' >> /etc/init.d/cjdns
- echo '' >> /etc/init.d/cjdns
- echo 'PROG="cjdroute"' >> /etc/init.d/cjdns
- echo 'GIT_PATH="/etc/cjdns"' >> /etc/init.d/cjdns
- echo 'PROG_PATH="/etc/cjdns"' >> /etc/init.d/cjdns
- echo 'CJDNS_CONFIG="cjdroute.conf"' >> /etc/init.d/cjdns
- echo 'CJDNS_USER="cjdns"' >> /etc/init.d/cjdns
- echo "CJDNS_IP='$CJDNS_IPV6'" >> /etc/init.d/cjdns
- echo '' >> /etc/init.d/cjdns
- echo 'start() {' >> /etc/init.d/cjdns
- echo ' # Start it up with the user cjdns' >> /etc/init.d/cjdns
- echo ' if [ $(pgrep cjdroute | wc -l) != 0 ];' >> /etc/init.d/cjdns
- echo ' then' >> /etc/init.d/cjdns
- echo ' echo "cjdroute is already running. Doing nothing..."' >> /etc/init.d/cjdns
- echo ' else' >> /etc/init.d/cjdns
- echo ' echo " * Starting cjdroute"' >> /etc/init.d/cjdns
- echo ' su -c "$PROG_PATH/$PROG < $PROG_PATH/$CJDNS_CONFIG" - $CJDNS_USER' >> /etc/init.d/cjdns
- echo ' /sbin/ip addr add $CJDNS_IP/8 dev tun0' >> /etc/init.d/cjdns
- echo ' /sbin/ip link set mtu 1312 dev tun0' >> /etc/init.d/cjdns
- echo ' /sbin/ip link set tun0 up' >> /etc/init.d/cjdns
- echo ' /sbin/ip tuntap add mode tun user cjdns dev tun0' >> /etc/init.d/cjdns
- echo ' fi' >> /etc/init.d/cjdns
- echo '}' >> /etc/init.d/cjdns
- echo '' >> /etc/init.d/cjdns
- echo 'stop() {' >> /etc/init.d/cjdns
- echo '' >> /etc/init.d/cjdns
- echo ' if [ $(pgrep cjdroute | wc -l) != 2 ];' >> /etc/init.d/cjdns
- echo ' then' >> /etc/init.d/cjdns
- echo ' echo "cjdns isnt running."' >> /etc/init.d/cjdns
- echo ' else' >> /etc/init.d/cjdns
- echo ' echo "Killing cjdroute"' >> /etc/init.d/cjdns
- echo ' killall cjdroute' >> /etc/init.d/cjdns
- echo ' fi' >> /etc/init.d/cjdns
- echo '}' >> /etc/init.d/cjdns
- echo '' >> /etc/init.d/cjdns
- echo 'status() {' >> /etc/init.d/cjdns
- echo ' if [ $(pgrep cjdroute | wc -l) != 0 ];' >> /etc/init.d/cjdns
- echo ' then' >> /etc/init.d/cjdns
- echo ' echo "Cjdns is running"' >> /etc/init.d/cjdns
- echo ' else' >> /etc/init.d/cjdns
- echo ' echo "Cjdns is not running"' >> /etc/init.d/cjdns
- echo ' fi' >> /etc/init.d/cjdns
- echo '}' >> /etc/init.d/cjdns
- echo '' >> /etc/init.d/cjdns
- echo ' update() {' >> /etc/init.d/cjdns
- echo ' cd $GIT_PATH' >> /etc/init.d/cjdns
- echo ' echo "Updating..."' >> /etc/init.d/cjdns
- echo ' git pull' >> /etc/init.d/cjdns
- echo ' ./do' >> /etc/init.d/cjdns
- echo '}' >> /etc/init.d/cjdns
- echo '' >> /etc/init.d/cjdns
- echo '## Check to see if we are running as root first.' >> /etc/init.d/cjdns
- echo 'if [ "$(id -u)" != "0" ]; then' >> /etc/init.d/cjdns
- echo ' echo "This script must be run as root" 1>&2' >> /etc/init.d/cjdns
- echo ' exit 1' >> /etc/init.d/cjdns
- echo 'fi' >> /etc/init.d/cjdns
- echo '' >> /etc/init.d/cjdns
- echo 'case $1 in' >> /etc/init.d/cjdns
- echo ' start)' >> /etc/init.d/cjdns
- echo ' start' >> /etc/init.d/cjdns
- echo ' exit 0' >> /etc/init.d/cjdns
- echo ' ;;' >> /etc/init.d/cjdns
- echo ' stop)' >> /etc/init.d/cjdns
- echo ' stop' >> /etc/init.d/cjdns
- echo ' exit 0' >> /etc/init.d/cjdns
- echo ' ;;' >> /etc/init.d/cjdns
- echo ' reload|restart|force-reload)' >> /etc/init.d/cjdns
- echo ' stop' >> /etc/init.d/cjdns
- echo ' sleep 1' >> /etc/init.d/cjdns
- echo ' start' >> /etc/init.d/cjdns
- echo ' exit 0' >> /etc/init.d/cjdns
- echo ' ;;' >> /etc/init.d/cjdns
- echo ' status)' >> /etc/init.d/cjdns
- echo ' status' >> /etc/init.d/cjdns
- echo ' exit 0' >> /etc/init.d/cjdns
- echo ' ;;' >> /etc/init.d/cjdns
- echo ' update|upgrade)' >> /etc/init.d/cjdns
- echo ' update' >> /etc/init.d/cjdns
- echo ' stop' >> /etc/init.d/cjdns
- echo ' sleep 2' >> /etc/init.d/cjdns
- echo ' start' >> /etc/init.d/cjdns
- echo ' exit 0' >> /etc/init.d/cjdns
- echo ' ;;' >> /etc/init.d/cjdns
- echo ' **)' >> /etc/init.d/cjdns
- echo ' echo "Usage: $0 (start|stop|restart|status|update)" 1>&2' >> /etc/init.d/cjdns
- echo ' exit 1' >> /etc/init.d/cjdns
- echo ' ;;' >> /etc/init.d/cjdns
- echo 'esac' >> /etc/init.d/cjdns
- chmod +x /etc/init.d/cjdns
- update-rc.d cjdns defaults
- service cjdns start
- if [ ! "$?" = "0" ]; then
- systemctl status cjdns.service
- exit 8260
- fi
-
- apt-get -y install radvd
- echo 'interface eth0' > /etc/radvd.conf
- echo '{' >> /etc/radvd.conf
- echo ' AdvSendAdvert on;' >> /etc/radvd.conf
- echo ' prefix fdfc::1/64' >> /etc/radvd.conf
- echo ' {' >> /etc/radvd.conf
- echo ' AdvRouterAddr on;' >> /etc/radvd.conf
- echo ' };' >> /etc/radvd.conf
- echo '};' >> /etc/radvd.conf
- systemctl restart radvd
- if [ ! "$?" = "0" ]; then
- systemctl status radvd.service
- exit 4395
- fi
-
- if ! grep -q "# Mesh Networking (cjdns)" /etc/network/interfaces; then
- echo '' >> /etc/network/interfaces
- echo '# Mesh Networking (cjdns)' >> /etc/network/interfaces
- echo 'iface eth0 inet6 static' >> /etc/network/interfaces
- echo ' pre-up modprobe ipv6' >> /etc/network/interfaces
- echo ' address fdfc:0000:0000:0000:0000:0000:0000:0001' >> /etc/network/interfaces
- echo ' netmask 64' >> /etc/network/interfaces
- service network-manager restart
- if [ ! "$?" = "0" ]; then
- systemctl status networking.service
- exit 6949
- fi
- fi
-
- if ! grep -q $"Mesh Networking (cjdns)" /home/$MY_USERNAME/README; then
- CURRENT_IP_ADDRESS=$(ip addr show | grep "inet " | sed -n 2p | awk -F ' ' '{print $2}' | awk -F '/' '{print $1}')
-
- echo '' >> /home/$MY_USERNAME/README
- echo '' >> /home/$MY_USERNAME/README
- echo $'Mesh Networking (cjdns)' >> /home/$MY_USERNAME/README
- echo '=======================' >> /home/$MY_USERNAME/README
- echo $"cjdns IPv6 address: $CJDNS_IPV6" >> /home/$MY_USERNAME/README
- echo $"cjdns public key: $CJDNS_PUBLIC_KEY" >> /home/$MY_USERNAME/README
- echo $"cjdns private key: $CJDNS_PRIVATE_KEY" >> /home/$MY_USERNAME/README
- echo $"cjdns password: $CJDNS_PASSWORD" >> /home/$MY_USERNAME/README
- echo $"cjdns port: $CJDNS_PORT" >> /home/$MY_USERNAME/README
- echo '' >> /home/$MY_USERNAME/README
- echo $"Forward port $CJDNS_PORT from your internet router to the ${PROJECT_NAME}" >> /home/$MY_USERNAME/README
- echo '' >> /home/$MY_USERNAME/README
- echo $'Below is an example of your connection credentials' >> /home/$MY_USERNAME/README
- echo $'that you can give to other people so they can connect' >> /home/$MY_USERNAME/README
- echo $'to you using your default password' >> /home/$MY_USERNAME/README
- echo $'Adding a unique password for each user is advisable' >> /home/$MY_USERNAME/README
- echo $'so that leaks can be isolated.' >> /home/$MY_USERNAME/README
- echo '' >> /home/$MY_USERNAME/README
- echo "\"$CURRENT_IP_ADDRESS:$CJDNS_PORT\":{\"password\":\"$CJDNS_PASSWORD\",\"publicKey\":\"$CJDNS_PUBLIC_KEY\"}" >> /home/$MY_USERNAME/README
- echo '' >> /home/$MY_USERNAME/README
- echo $'More is not better. 3-5 cjdns peers is good. 30 peers is bad.' >> /home/$MY_USERNAME/README
- echo '' >> /home/$MY_USERNAME/README
- echo $'NEVER USE A PUBLIC PEER. These degrade the network and make it centralized.' >> /home/$MY_USERNAME/README
- echo $'Each node can handle many peers, but no node can handle the entire internet.' >> /home/$MY_USERNAME/README
- echo $'As this network grows any public peer will simply become saturated and' >> /home/$MY_USERNAME/README
- echo $'useless causing issues for the entire network.' >> /home/$MY_USERNAME/README
- echo $'Please report anyone offering you a public peer as they are promoting shared' >> /home/$MY_USERNAME/README
- echo $'passwords which could lead to people pretending to be you. A peering pass' >> /home/$MY_USERNAME/README
- echo $'should not contain someone elses nickname or info but should contain yours' >> /home/$MY_USERNAME/README
- echo $'to ensure it is not shared. It also helps when editing the conf to know who' >> /home/$MY_USERNAME/README
- echo $'each password is for.' >> /home/$MY_USERNAME/README
- echo '' >> /home/$MY_USERNAME/README
- echo $'Possible cjdns destinations of interest:' >> /home/$MY_USERNAME/README
- echo ' http://transitiontech.ca/faq' >> /home/$MY_USERNAME/README
- echo ' http://cjdns.ca/hypeirc.txt' >> /home/$MY_USERNAME/README
- chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
- chmod 600 /home/$MY_USERNAME/README
- fi
-
- function_check configure_firewall_for_cjdns
- configure_firewall_for_cjdns
-
- echo 'install_cjdns_main' >> $COMPLETION_FILE
-}
-
-function install_cjdns_tools {
- if grep -Fxq "install_cjdns_tools" $COMPLETION_FILE; then
- return
- fi
- if [[ $ENABLE_CJDNS != "yes" ]]; then
- return
- fi
- if [ ! -d /etc/cjdns ]; then
- install_cjdns
- fi
-
- apt-get -y install mercurial
- if [ ! -f ~/.bashrc ]; then
- touch ~/.bashrc
- fi
-
- if [ ! -d /home/git ]; then
- # add a gogs user account
- adduser --disabled-login --gecos 'Gogs' git
-
- # install Go
- if ! grep -q "export GOPATH=" ~/.bashrc; then
- echo "export GOPATH=$GOPATH" >> ~/.bashrc
- fi
- systemctl set-environment GOPATH=$GOPATH
- if ! grep -q "systemctl set-environment GOPATH=" ~/.bashrc; then
- echo "systemctl set-environment GOPATH=$GOPATH" >> ~/.bashrc
- fi
- if [ ! -d $GOPATH ]; then
- mkdir -p $GOPATH
- fi
- fi
-
- if ! grep -q "export GOPATH=" ~/.bashrc; then
- echo "export GOPATH=$GOPATH" >> ~/.bashrc
- fi
- expected_go_path='export PATH=$PATH:'${GOPATH}'/bin'
- export PATH=$PATH:${GOPATH}/bin
- if ! grep -q "$expected_go_path" ~/.bashrc; then
- echo "$expected_go_path" >> ~/.bashrc
- fi
- export PATH=$PATH:$GOPATH/bin
- CJDCMD_REPO2=$(echo "$CJDCMD_REPO" | sed 's|https://||g')
- go get $CJDCMD_REPO2
- if [ ! -f $GOPATH/bin/cjdcmd ]; then
- echo $'cjdcmd was not compiled. Check your golang installation'
- exit 7439
- fi
- cp $GOPATH/bin/cjdcmd /usr/bin
-
- # initialise from the cjdns config
- /usr/bin/cjdcmd cjdnsadmin -file /etc/cjdns/cjdroute.conf
-
- install_completed cjdns_tools
-}
-
-function install_cjdns {
- install_cjdns_main
- install_cjdns_tools
- install_completed cjdns
- APP_INSTALLED=1
-}
-
-# NOTE: deliberately no exit 0
diff --git a/src/freedombone-config b/src/freedombone-config
index 0739ca15a..d7e483825 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -60,9 +60,7 @@ DDNS_PASSWORD=
MY_NAME=
LOCAL_NETWORK_STATIC_IP_ADDRESS=
ROUTER_IP_ADDRESS=
-ENABLE_CJDNS=
ENABLE_BATMAN=
-ENABLE_BABEL=
DEBIAN_REPO=
NAMESERVER1=
NAMESERVER2=
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 7a899a247..631ccc24d 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -1043,12 +1043,11 @@ function restore_from_remote {
23 $"Gogs" off \
24 $"Wiki" off \
25 $"Blog" off \
- 26 $"CJDNS" off \
- 27 $"Email" off \
- 28 $"DLNA" off \
- 29 $"Mumble" off \
- 30 $"RSS reader" off \
- 31 $"Tox" off 2> $data
+ 26 $"Email" off \
+ 27 $"DLNA" off \
+ 28 $"Mumble" off \
+ 29 $"RSS reader" off \
+ 30 $"Tox" off 2> $data
sel=$?
case $sel in
1) break;;
@@ -1085,12 +1084,11 @@ function restore_from_remote {
23) ${PROJECT_NAME}-restore-remote $remote_domain_name gogs;;
24) ${PROJECT_NAME}-restore-remote $remote_domain_name wiki;;
25) ${PROJECT_NAME}-restore-remote $remote_domain_name blog;;
- 26) ${PROJECT_NAME}-restore-remote $remote_domain_name cjdns;;
- 27) ${PROJECT_NAME}-restore-remote $remote_domain_name email;;
- 28) ${PROJECT_NAME}-restore-remote $remote_domain_name dlna;;
- 29) ${PROJECT_NAME}-restore-remote $remote_domain_name mumble;;
- 30) ${PROJECT_NAME}-restore-remote $remote_domain_name ttrss;;
- 31) ${PROJECT_NAME}-restore-remote $remote_domain_name tox;;
+ 26) ${PROJECT_NAME}-restore-remote $remote_domain_name email;;
+ 27) ${PROJECT_NAME}-restore-remote $remote_domain_name dlna;;
+ 28) ${PROJECT_NAME}-restore-remote $remote_domain_name mumble;;
+ 29) ${PROJECT_NAME}-restore-remote $remote_domain_name ttrss;;
+ 30) ${PROJECT_NAME}-restore-remote $remote_domain_name tox;;
esac
done
any_key
diff --git a/src/freedombone-image b/src/freedombone-image
index 647f2c746..b364e2a1e 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -213,9 +213,7 @@ function mesh_router_setup_script {
echo 'DDNS_PASSWORD=' >> $mesh_script_filename
echo 'DEFAULT_LANGUAGE=en_GB.UTF-8' >> $mesh_script_filename
echo 'MY_EMAIL_ADDRESS=' >> $mesh_script_filename
- echo 'ENABLE_CJDNS=no' >> $mesh_script_filename
echo 'ENABLE_BATMAN=yes' >> $mesh_script_filename
- echo 'ENABLE_BABEL=no' >> $mesh_script_filename
echo 'DEBIAN_REPO=' >> $mesh_script_filename
echo 'NAMESERVER1=' >> $mesh_script_filename
echo 'NAMESERVER2=' >> $mesh_script_filename
diff --git a/src/freedombone-mesh-install b/src/freedombone-mesh-install
index 6ca9d25bc..7cc5e193c 100755
--- a/src/freedombone-mesh-install
+++ b/src/freedombone-mesh-install
@@ -44,9 +44,6 @@ WIFI_INTERFACE='wlan0'
BATMAN_CELLID='02:BA:00:00:03:01'
WIFI_SSID='mesh'
-# Babel
-BABEL_PORT=6696
-
rootdir=''
FN=
CHROOT_PREFIX=''
@@ -95,95 +92,6 @@ function show_help {
exit 0
}
-
-function install_babel {
- $CHROOT_PREFIX apt-get -y install babeld
-
- babel_script=${rootdir}/var/lib/babel
-
- echo '#!/bin/bash' > $babel_script
- echo '' >> $babel_script
- echo 'if [[ $1 == "ls" || $1 == "list" ]]; then' >> $babel_script
- echo ' avahi-browse -atl' >> $babel_script
- echo ' exit 0' >> $babel_script
- echo 'fi' >> $babel_script
- echo '' >> $babel_script
- echo 'if [[ $1 == "start" ]]; then' >> $babel_script
- echo ' sed -i "s|#host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
- echo ' sed -i "s|host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
- echo ' sed -i "s|use-ipv4=.*|use-ipv4=yes|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
- echo ' sed -i "s|use-ipv6=.*|use-ipv6=no|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
- echo ' sed -i "s|hosts:.*|hosts: files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf' >> $babel_script
- echo ' systemctl restart avahi-daemon' >> $babel_script
- echo 'fi' >> $babel_script
- echo '' >> $babel_script
- echo "IFACE=$WIFI_INTERFACE" >> $babel_script
- echo 'if [[ $IFACE == "wlan0" ]]; then' >> $babel_script
- echo ' if grep -q "wlan1" /proc/net/dev; then' >> $babel_script
- echo ' IFACE=wlan1' >> $babel_script
- echo ' fi' >> $babel_script
- echo 'fi' >> $babel_script
- echo 'if [[ $IFACE == "wlan0" ]]; then' >> $babel_script
- echo ' if grep -q "wlan2" /proc/net/dev; then' >> $babel_script
- echo ' IFACE=wlan2' >> $babel_script
- echo ' fi' >> $babel_script
- echo 'fi' >> $babel_script
- echo 'if [[ $IFACE == "wlan0" ]]; then' >> $babel_script
- echo ' if grep -q "wlan3" /proc/net/dev; then' >> $babel_script
- echo ' IFACE=wlan3' >> $babel_script
- echo ' fi' >> $babel_script
- echo 'fi' >> $babel_script
- echo '' >> $babel_script
- echo 'if [[ ! grep -q "$IFACE" /proc/net/dev || $1 == "stop" ]]; then' >> $babel_script
- echo ' if ! grep -q "$IFACE" /proc/net/dev; then' >> $babel_script
- echo ' echo "Interface $IFACE was not found"' >> $babel_script
- echo ' else' >> $babel_script
- echo ' echo "Stopping"' >> $babel_script
- echo ' fi' >> $babel_script
- echo ' ifconfig $IFACE down' >> $babel_script
- echo ' pkill babeld' >> $babel_script
- echo ' systemctl restart network-manager' >> $babel_script
- echo ' exit 1' >> $babel_script
- echo 'fi' >> $babel_script
- echo '' >> $babel_script
- echo 'systemctl stop network-manager' >> $babel_script
- echo 'ifconfig $IFACE down' >> $babel_script
- echo -n 'iwconfig $IFACE mode ad-hoc channel ' >> $babel_script
- echo "$WIFI_CHANNEL essid \"$WIFI_SSID\"" >> $babel_script
- echo 'ifconfig $IFACE up' >> $babel_script
- echo -n 'ifconfig $IFACE:avahi ' >> $babel_script
- echo -n "$LOCAL_NETWORK_STATIC_IP_ADDRESS netmask " >> $babel_script
- echo '255.255.255.0 broadcast 192.168.13.255' >> $babel_script
- echo -n 'babeld -D $IFACE:avahi -p ' >> $babel_script
- echo -n "$BABEL_PORT -d 5 " >> $babel_script
- echo '$IFACE' >> $babel_script
- echo 'exit 0' >> $babel_script
- chmod +x $babel_script
-
- echo '[Unit]' > ${rootdir}/etc/systemd/system/babel.service
- echo 'Description=Babel Mesh' >> ${rootdir}/etc/systemd/system/babel.service
- echo '' >> ${rootdir}/etc/systemd/system/babel.service
- echo '[Service]' >> ${rootdir}/etc/systemd/system/babel.service
- echo 'Type=oneshot' >> ${rootdir}/etc/systemd/system/babel.service
- echo "ExecStart=$babel_script start" >> ${rootdir}/etc/systemd/system/babel.service
- echo "ExecStop=$babel_script stop" >> ${rootdir}/etc/systemd/system/babel.service
- echo 'RemainAfterExit=yes' >> ${rootdir}/etc/systemd/system/babel.service
- echo '' >> ${rootdir}/etc/systemd/system/babel.service
- echo '# Allow time for the server to start/stop' >> ${rootdir}/etc/systemd/system/babel.service
- echo 'TimeoutSec=300' >> ${rootdir}/etc/systemd/system/babel.service
- echo '' >> ${rootdir}/etc/systemd/system/babel.service
- echo '[Install]' >> /etc/systemd/system/babel.service
- echo 'WantedBy=multi-user.target' >> ${rootdir}/etc/systemd/system/babel.service
- $CHROOT_PREFIX systemctl enable babel
-}
-
-function install_babel_remove {
- $CHROOT_PREFIX systemctl stop babel
- $CHROOT_PREFIX apt-get -y remove --purge babeld
- rm ${rootdir}/var/lib/babel
- rm ${rootdir}/etc/systemd/system/babel.service
-}
-
function mesh_avahi {
$CHROOT_PREFIX apt-get -y install avahi-utils avahi-autoipd avahi-dnsconfd
@@ -192,12 +100,12 @@ function mesh_avahi {
sed -i "s|#host-name=.*|host-name=P$PEER_ID|g" $rootdir/etc/avahi/avahi-daemon.conf
if [ ! -d $rootdir/etc/avahi/services ]; then
- mkdir -p $rootdir/etc/avahi/services
+ mkdir -p $rootdir/etc/avahi/services
fi
# remove an avahi service which isn't used
if [ -f $rootdir/etc/avahi/services/udisks.service ]; then
- rm $rootdir/etc/avahi/services/udisks.service
+ rm $rootdir/etc/avahi/services/udisks.service
fi
# Add an ssh service
@@ -224,108 +132,6 @@ function mesh_avahi {
chmod +x $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
}
-function install_babel_client {
- # TODO to be fixed
- TOXIC_FILE=$(cat /usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
-
- if [ ! -f ${rootdir}/tmp/meshtype ]; then
- $CHROOT_PREFIX sudo apt-get -y install babeld
- if [ ! -f $TOXIC_FILE ]; then
- $CHROOT_PREFIX sudo apt-get -y install toxic
- fi
-
- CURR_DIR=$(pwd)
- if [ ! -f ~/develop/toxid ]; then
- if [ ! -f ~/develop ]; then
- mkdir ~/develop
- fi
- cd ~/develop
- git_clone $TOXID_REPO ~/develop/toxid
- fi
- cd ~/develop/toxid
- sudo make install
- cd $CURR_DIR
- fi
-
- babel_script=${rootdir}/tmp/babel
-
- echo '#!/bin/bash' > $babel_script
- echo '' >> $babel_script
- echo 'if [[ $1 == "ls" || $1 == "list" ]]; then' >> $babel_script
- echo ' avahi-browse -atl' >> $babel_script
- echo ' exit 0' >> $babel_script
- echo 'fi' >> $babel_script
- echo '' >> $babel_script
- echo 'if [[ $1 == "start" ]]; then' >> $babel_script
- echo ' if [ -f /tmp/meshtype ] ; then' >> $babel_script
- echo ' echo "Mesh already running"' >> $babel_script
- echo ' return' >> $babel_script
- echo ' fi' >> $batman_script
- echo ' # install avahi' >> $babel_script
- echo ' apt-get -y install avahi-utils avahi-autoipd avahi-daemon avahi-dnsconfd bittornado' >> $babel_script
- echo ' sed -i "s|#host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
- echo ' sed -i "s|host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
- echo ' if [ -f /bin/systemctl ]; then' >> $babel_script
- echo ' systemctl restart avahi-daemon' >> $babel_script
- echo ' else' >> $babel_script
- echo ' service avahi-daemon restart' >> $babel_script
- echo ' fi' >> $babel_script
- echo ' echo "babel" > /tmp/meshtype' >> $babel_script
- echo 'fi' >> $babel_script
- echo '' >> $babel_script
- echo "IFACE=$WIFI_INTERFACE" >> $babel_script
- echo 'if [[ $IFACE == "wlan0" ]]; then' >> $babel_script
- echo ' if grep -q "wlan1" /proc/net/dev; then' >> $babel_script
- echo ' IFACE=wlan1' >> $babel_script
- echo ' fi' >> $babel_script
- echo 'fi' >> $babel_script
- echo 'if [[ $IFACE == "wlan0" ]]; then' >> $babel_script
- echo ' if grep -q "wlan2" /proc/net/dev; then' >> $babel_script
- echo ' IFACE=wlan2' >> $babel_script
- echo ' fi' >> $babel_script
- echo 'fi' >> $babel_script
- echo 'if [[ $IFACE == "wlan0" ]]; then' >> $babel_script
- echo ' if grep -q "wlan3" /proc/net/dev; then' >> $babel_script
- echo ' IFACE=wlan3' >> $babel_script
- echo ' fi' >> $babel_script
- echo 'fi' >> $babel_script
- echo '' >> $babel_script
- echo 'if [[ ! grep -q "$IFACE" /proc/net/dev || $1 == "stop" ]]; then' >> $babel_script
- echo ' if ! grep -q "$IFACE" /proc/net/dev; then' >> $babel_script
- echo ' echo "Interface $IFACE was not found"' >> $babel_script
- echo ' else' >> $babel_script
- echo ' echo "Stopping"' >> $babel_script
- echo ' fi' >> $babel_script
- echo ' ifconfig $IFACE down' >> $babel_script
- echo ' pkill babeld' >> $babel_script
- echo ' if [ -f /bin/systemctl ]; then' >> $babel_script
- echo ' systemctl restart network-manager' >> $babel_script
- echo ' else' >> $babel_script
- echo ' service network-manager restart' >> $babel_script
- echo ' fi' >> $babel_script
- echo ' exit 1' >> $babel_script
- echo 'fi' >> $babel_script
- echo '' >> $babel_script
- echo 'if [ -f /bin/systemctl ]; then' >> $babel_script
- echo ' systemctl stop network-manager' >> $babel_script
- echo 'else' >> $babel_script
- echo ' service network-manager stop' >> $babel_script
- echo 'fi' >> $babel_script
- echo 'ifconfig $IFACE down' >> $babel_script
- echo -n 'iwconfig $IFACE mode ad-hoc channel ' >> $babel_script
- echo "$WIFI_CHANNEL essid \"$WIFI_SSID\"" >> $babel_script
- echo 'ifconfig $IFACE up' >> $babel_script
- echo -n 'ifconfig $IFACE:avahi ' >> $babel_script
- echo -n "$LOCAL_NETWORK_STATIC_IP_ADDRESS netmask " >> $babel_script
- echo '255.255.255.0 broadcast 192.168.13.255' >> $babel_script
- echo -n 'babeld -D $IFACE:avahi -p ' >> $babel_script
- echo -n "$BABEL_PORT -d 5 " >> $babel_script
- echo '$IFACE' >> $babel_script
- echo 'exit 0' >> $babel_script
- chmod +x $babel_script
- sudo mv $babel_script ${rootdir}/usr/bin/babel
-}
-
function install_batman_remove {
systemctl stop batman
rm $rootdir/var/lib/batman
@@ -338,15 +144,15 @@ function install_batman {
$CHROOT_PREFIX apt-get -y install wireless-tools rfkill
if ! grep -q "batman_adv" $rootdir/etc/modules; then
- echo 'batman_adv' >> $rootdir/etc/modules
+ echo 'batman_adv' >> $rootdir/etc/modules
fi
BATMAN_SCRIPT=$rootdir/var/lib/batman
if [ -f /usr/local/bin/${PROJECT_NAME}-mesh-batman ]; then
- cp /usr/local/bin/${PROJECT_NAME}-mesh-batman $BATMAN_SCRIPT
+ cp /usr/local/bin/${PROJECT_NAME}-mesh-batman $BATMAN_SCRIPT
else
- cp /usr/bin/${PROJECT_NAME}-mesh-batman $BATMAN_SCRIPT
+ cp /usr/bin/${PROJECT_NAME}-mesh-batman $BATMAN_SCRIPT
fi
BATMAN_DAEMON=$rootdir/etc/systemd/system/batman.service
@@ -450,48 +256,38 @@ do
key="$1"
case $key in
- -h|--help)
- show_help
- ;;
- -f|--function)
- shift
- FN="$1"
- ;;
- -r|--rootdir)
- shift
- rootdir="$1"
- CHROOT_PREFIX='chroot "${rootdir}"'
- ;;
- -w|--wifi|--interface)
- shift
- WIFI_INTERFACE="$1"
- ;;
- -m|--mirror)
- shift
- FRIENDS_MIRRORS_SERVER="$1"
- ;;
- --remove)
- shift
- REMOVE="$1"
- ;;
- *)
- # unknown option
- ;;
+ -h|--help)
+ show_help
+ ;;
+ -f|--function)
+ shift
+ FN="$1"
+ ;;
+ -r|--rootdir)
+ shift
+ rootdir="$1"
+ CHROOT_PREFIX='chroot "${rootdir}"'
+ ;;
+ -w|--wifi|--interface)
+ shift
+ WIFI_INTERFACE="$1"
+ ;;
+ -m|--mirror)
+ shift
+ FRIENDS_MIRRORS_SERVER="$1"
+ ;;
+ --remove)
+ shift
+ REMOVE="$1"
+ ;;
+ *)
+ # unknown option
+ ;;
esac
shift
done
-if [[ $FN == 'babel' ]]; then
- if [[ $REMOVE != 'yes' ]]; then
- install_babel
- else
- install_babel_remove
- fi
-fi
-if [[ $FN == 'babel_client' ]]; then
- install_babel_client
-fi
if [[ $FN == 'avahi' ]]; then
mesh_avahi
fi
@@ -500,9 +296,9 @@ if [[ $FN == 'firewall' ]]; then
fi
if [[ $FN == 'batman' ]]; then
if [[ $REMOVE != 'yes' ]]; then
- install_batman
+ install_batman
else
- install_batman_remove
+ install_batman_remove
fi
fi
if [[ $FN == 'qtox' ]]; then
diff --git a/src/freedombone-utils-avahi b/src/freedombone-utils-avahi
index 3618431c3..74b583b99 100755
--- a/src/freedombone-utils-avahi
+++ b/src/freedombone-utils-avahi
@@ -103,7 +103,7 @@ function install_avahi {
return
fi
# only enable avahi if we're doing mesh networking
- if [[ $ENABLE_BABEL != "yes" && $ENABLE_BATMAN != "yes" && $ENABLE_CJDNS != "yes" ]]; then
+ if [[ $ENABLE_BATMAN != "yes" ]]; then
return
fi
diff --git a/src/freedombone-utils-config b/src/freedombone-utils-config
index 50e0cec97..36e10a6be 100755
--- a/src/freedombone-utils-config
+++ b/src/freedombone-utils-config
@@ -96,9 +96,7 @@ configuration_variables=(FRIENDS_MIRRORS_SERVER
WIFI_CHANNEL
IPV6_NETWORK
HWRNG_TYPE
- ENABLE_BABEL
ENABLE_BATMAN
- ENABLE_CJDNS
PUBLIC_MAILING_LIST)
function read_config_param {
diff --git a/src/freedombone-utils-help b/src/freedombone-utils-help
index a89d175ff..27d8b521d 100755
--- a/src/freedombone-utils-help
+++ b/src/freedombone-utils-help
@@ -59,7 +59,6 @@ function show_help {
echo $' --name Your name'
echo $' --email Your email address'
echo $' --usb Path for the USB drive (eg. /dev/sdb1)'
- echo $' --cjdns Enable CJDNS'
echo $' --vpass Mumble server password'
echo $' --vport Mumble server port'
echo $' --ns1 First DNS nameserver'
diff --git a/src/freedombone-utils-wifi b/src/freedombone-utils-wifi
index a4314447f..9608da542 100755
--- a/src/freedombone-utils-wifi
+++ b/src/freedombone-utils-wifi
@@ -88,7 +88,7 @@ function install_atheros_wifi {
if [ $INSTALLING_ON_BBB != "yes" ]; then
return
fi
- if [[ $ENABLE_BABEL != "yes" && $ENABLE_BATMAN != "yes" && $ENABLE_CJDNS != "yes" ]]; then
+ if [[ $ENABLE_BATMAN != "yes" ]]; then
return
fi
if [ -d $INSTALL_DIR/open-ath9k-htc-firmware ]; then
--
GitLab