Browse Source

Monkeysphere is deprecated

Bob Mottram 7 years ago
parent
commit
e3237fffad
1 changed files with 6 additions and 27 deletions
  1. 6
    27
      src/freedombone-client

+ 6
- 27
src/freedombone-client View File

42
 if [ -f /usr/bin/pacman ]; then
42
 if [ -f /usr/bin/pacman ]; then
43
     CURR_GROUP='users'
43
     CURR_GROUP='users'
44
 fi
44
 fi
45
-ENABLE_MONKEYSPHERE=
46
 
45
 
47
 # setup for a specific app
46
 # setup for a specific app
48
 SETUP_CLIENT_APP_NAME=
47
 SETUP_CLIENT_APP_NAME=
185
             { echo "# ${PROJECT_NAME} settings start";
184
             { echo "# ${PROJECT_NAME} settings start";
186
               echo 'Host *.onion';
185
               echo 'Host *.onion';
187
               echo '  ServerAliveInterval 60';
186
               echo '  ServerAliveInterval 60';
188
-              echo '  ServerAliveCountMax 3'; } >> ~/.ssh/config
189
-
190
-            if [[ "$ENABLE_MONKEYSPHERE" == $'yes' || "$ENABLE_MONKEYSPHERE" == $'y' ]]; then
191
-                echo "  ProxyCommand sh -c 'monkeysphere ssh-proxycommand --no-connect %h %p ; $proxycmd'" >> ~/.ssh/config
192
-            else
193
-                echo "  ProxyCommand $proxycmd" >> ~/.ssh/config
194
-            fi
195
-            { echo 'Host *';
187
+              echo '  ServerAliveCountMax 3';
188
+              echo "  ProxyCommand $proxycmd";
189
+              echo 'Host *';
196
               echo '  ServerAliveInterval 60';
190
               echo '  ServerAliveInterval 60';
197
-              echo '  ServerAliveCountMax 3'; } >> ~/.ssh/config
198
-            if [[ "$ENABLE_MONKEYSPHERE" == $'yes' || "$ENABLE_MONKEYSPHERE" == $'y' ]]; then
199
-                echo '  ProxyCommand monkeysphere ssh-proxycommand %h %p' >> ~/.ssh/config
200
-            fi
201
-            echo "# ${PROJECT_NAME} settings end" >> ~/.ssh/config
191
+              echo '  ServerAliveCountMax 3';
192
+              echo "# ${PROJECT_NAME} settings end"; } >> ~/.ssh/config
202
         fi
193
         fi
203
     fi
194
     fi
204
 
195
 
213
     echo $'and set it to "no".'
204
     echo $'and set it to "no".'
214
 }
205
 }
215
 
206
 
216
-function configure_monkeysphere {
217
-    if [ -f /usr/bin/pacman ]; then
218
-        return
219
-    fi
220
-    sudo apt-get -yq install monkeysphere
221
-}
222
-
223
 function show_help {
207
 function show_help {
224
     echo ''
208
     echo ''
225
-    echo $"${PROJECT_NAME}-client --monkeysphere [yes|no]"
209
+    echo $"${PROJECT_NAME}-client"
226
     echo ''
210
     echo ''
227
     exit 0
211
     exit 0
228
 }
212
 }
330
             verify_ssh_server_key
314
             verify_ssh_server_key
331
             exit 0
315
             exit 0
332
             ;;
316
             ;;
333
-        --monkeysphere|--ms|--monkey)
334
-            shift
335
-            ENABLE_MONKEYSPHERE=${1}
336
-            ;;
337
         *)
317
         *)
338
             # unknown option
318
             # unknown option
339
             ;;
319
             ;;
347
 refresh_gpg_keys
327
 refresh_gpg_keys
348
 configure_ssh_client
328
 configure_ssh_client
349
 global_rate_limit
329
 global_rate_limit
350
-configure_monkeysphere
351
 remove_known_hosts_entries
330
 remove_known_hosts_entries
352
 echo $'Configuration complete'
331
 echo $'Configuration complete'
353
 exit 0
332
 exit 0