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

Merge branch 'stretch' of https://github.com/bashrc/freedombone

This commit is contained in:
Bob Mottram 2018-05-10 20:50:41 +01:00
parent ca865e6ba1 e3237fffad
commit f8df659058
1 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/freedombone-client
View File

@ -42,7 +42,6 @@ CURR_GROUP=$USER
if [ -f /usr/bin/pacman ]; then
CURR_GROUP='users'
fi
ENABLE_MONKEYSPHERE=
# setup for a specific app
SETUP_CLIENT_APP_NAME=
@ -185,20 +184,12 @@ function configure_ssh_client {
{ echo "# ${PROJECT_NAME} settings start";
echo 'Host *.onion';
echo ' ServerAliveInterval 60';
echo ' ServerAliveCountMax 3'; } >> ~/.ssh/config
if [[ "$ENABLE_MONKEYSPHERE" == $'yes' || "$ENABLE_MONKEYSPHERE" == $'y' ]]; then
echo " ProxyCommand sh -c 'monkeysphere ssh-proxycommand --no-connect %h %p ; $proxycmd'" >> ~/.ssh/config
else
echo " ProxyCommand $proxycmd" >> ~/.ssh/config
fi
{ echo 'Host *';
echo ' ServerAliveCountMax 3';
echo " ProxyCommand $proxycmd";
echo 'Host *';
echo ' ServerAliveInterval 60';
echo ' ServerAliveCountMax 3'; } >> ~/.ssh/config
if [[ "$ENABLE_MONKEYSPHERE" == $'yes' || "$ENABLE_MONKEYSPHERE" == $'y' ]]; then
echo ' ProxyCommand monkeysphere ssh-proxycommand %h %p' >> ~/.ssh/config
fi
echo "# ${PROJECT_NAME} settings end" >> ~/.ssh/config
echo ' ServerAliveCountMax 3';
echo "# ${PROJECT_NAME} settings end"; } >> ~/.ssh/config
fi
fi
@ -213,16 +204,9 @@ function configure_ssh_client {
echo $'and set it to "no".'
}
function configure_monkeysphere {
if [ -f /usr/bin/pacman ]; then
return
fi
sudo apt-get -yq install monkeysphere
}
function show_help {
echo ''
echo $"${PROJECT_NAME}-client --monkeysphere [yes|no]"
echo $"${PROJECT_NAME}-client"
echo ''
exit 0
}
@ -330,10 +314,6 @@ do
verify_ssh_server_key
exit 0
;;
--monkeysphere|--ms|--monkey)
shift
ENABLE_MONKEYSPHERE=${1}
;;
*)
# unknown option
;;
@ -347,7 +327,6 @@ setup_client_app
refresh_gpg_keys
configure_ssh_client
global_rate_limit
configure_monkeysphere
remove_known_hosts_entries
echo $'Configuration complete'
exit 0