Browse Source

tahoelafs storage node onion service name

Bob Mottram 8 years ago
parent
commit
4501edce9b
1 changed files with 13 additions and 12 deletions
  1. 13
    12
      src/freedombone-app-tahoelafs

+ 13
- 12
src/freedombone-app-tahoelafs View File

261
 }
261
 }
262
 
262
 
263
 function restore_local_tahoelafs {
263
 function restore_local_tahoelafs {
264
-    echo $"Restoring Tahoe-LAFS introducer"
264
+    echo $"Restoring Tahoe-LAFS"
265
     systemctl stop tahoelafs-storage
265
     systemctl stop tahoelafs-storage
266
-    systemctl stop tahoelafs-introducer
266
+    systemctl stop tahoelafs-client
267
     temp_restore_dir=/root/temptahoelafs
267
     temp_restore_dir=/root/temptahoelafs
268
     restore_directory_from_usb $temp_restore_dir tahoelafs
268
     restore_directory_from_usb $temp_restore_dir tahoelafs
269
     mv /home/tahoelafs /home/tahoelafs-old
269
     mv /home/tahoelafs /home/tahoelafs-old
274
     fi
274
     fi
275
     rm -rf /home/tahoelafs-old
275
     rm -rf /home/tahoelafs-old
276
     chown -R tahoelafs:debian-tor /home/tahoelafs
276
     chown -R tahoelafs:debian-tor /home/tahoelafs
277
-    systemctl start tahoelafs-introducer
277
+    systemctl start tahoelafs-client
278
     systemctl start tahoelafs-storage
278
     systemctl start tahoelafs-storage
279
     echo $"Restore complete"
279
     echo $"Restore complete"
280
 }
280
 }
285
         return
285
         return
286
     fi
286
     fi
287
     systemctl stop tahoelafs-storage
287
     systemctl stop tahoelafs-storage
288
-    systemctl stop tahoelafs-introducer
288
+    systemctl stop tahoelafs-client
289
     dest_directory=tahoelafs
289
     dest_directory=tahoelafs
290
     function_check backup_directory_to_usb
290
     function_check backup_directory_to_usb
291
     backup_directory_to_friend $source_directory $dest_directory
291
     backup_directory_to_friend $source_directory $dest_directory
292
-    systemctl start tahoelafs-introducer
292
+    systemctl start tahoelafs-client
293
     systemctl start tahoelafs-storage
293
     systemctl start tahoelafs-storage
294
 }
294
 }
295
 
295
 
296
 function restore_remote_tahoelafs {
296
 function restore_remote_tahoelafs {
297
-    echo $"Restoring Tahoe-LAFS introducer"
297
+    echo $"Restoring Tahoe-LAFS"
298
     systemctl stop tahoelafs-storage
298
     systemctl stop tahoelafs-storage
299
-    systemctl stop tahoelafs-introducer
299
+    systemctl stop tahoelafs-client
300
     temp_restore_dir=/root/temptahoelafs
300
     temp_restore_dir=/root/temptahoelafs
301
     restore_directory_from_friend $temp_restore_dir tahoelafs
301
     restore_directory_from_friend $temp_restore_dir tahoelafs
302
     mv /home/tahoelafs /home/tahoelafs-old
302
     mv /home/tahoelafs /home/tahoelafs-old
307
     fi
307
     fi
308
     rm -rf /home/tahoelafs-old
308
     rm -rf /home/tahoelafs-old
309
     chown -R tahoelafs:debian-tor /home/tahoelafs
309
     chown -R tahoelafs:debian-tor /home/tahoelafs
310
-    systemctl start tahoelafs-introducer
310
+    systemctl start tahoelafs-client
311
     systemctl start tahoelafs-storage
311
     systemctl start tahoelafs-storage
312
     echo $"Restore complete"
312
     echo $"Restore complete"
313
 }
313
 }
343
     remove_completion_param install_tahoelafs
343
     remove_completion_param install_tahoelafs
344
     function_check remove_onion_service
344
     function_check remove_onion_service
345
     remove_onion_service tahoelafs ${TAHOELAFS_ONION_PORT}
345
     remove_onion_service tahoelafs ${TAHOELAFS_ONION_PORT}
346
-    remove_onion_service tahoelafs-storage ${TAHOELAFS_STORAGE_ONION_PORT}
346
+    remove_onion_service storage-tahoelafs ${TAHOELAFS_STORAGE_ONION_PORT}
347
     sed -i '/HidServAuth /d' /etc/tor/torrc
347
     sed -i '/HidServAuth /d' /etc/tor/torrc
348
     deluser tahoelafs
348
     deluser tahoelafs
349
     if [ -d /home/tahoelafs ]; then
349
     if [ -d /home/tahoelafs ]; then
417
 }
417
 }
418
 
418
 
419
 function create_tahoelafs_storage_node {
419
 function create_tahoelafs_storage_node {
420
-    # Nodes can store introducer
420
+    # Nodes can store data
421
     node_dir="$1"
421
     node_dir="$1"
422
     furl="$2"
422
     furl="$2"
423
 
423
 
583
     apt-get -yq install build-essential python-pip python-dev libffi-dev libssl-dev
583
     apt-get -yq install build-essential python-pip python-dev libffi-dev libssl-dev
584
     apt-get -yq install libcrypto++-dev python-pycryptopp python-cffi python-virtualenv
584
     apt-get -yq install libcrypto++-dev python-pycryptopp python-cffi python-virtualenv
585
 
585
 
586
-    # create a user to run the introducer
586
+    # create a user
587
     if [ ! -d /home/tahoelafs ]; then
587
     if [ ! -d /home/tahoelafs ]; then
588
         # add a gogs user account
588
         # add a gogs user account
589
         adduser --disabled-login --gecos 'tahoe-lafs' tahoelafs
589
         adduser --disabled-login --gecos 'tahoe-lafs' tahoelafs
610
     client_nick=${MY_USERNAME}-client
610
     client_nick=${MY_USERNAME}-client
611
 
611
 
612
     # create an onion address for storage node
612
     # create an onion address for storage node
613
-    TAHOELAFS_STORAGE_ONION_HOSTNAME=$(add_onion_service tahoelafs-storage ${TAHOELAFS_STORAGE_PORT} ${TAHOELAFS_STORAGE_ONION_PORT} ${node_nick})
613
+    TAHOELAFS_STORAGE_ONION_HOSTNAME=$(add_onion_service storage-tahoelafs ${TAHOELAFS_STORAGE_PORT} ${TAHOELAFS_STORAGE_ONION_PORT} ${node_nick})
614
 
614
 
615
     # create an onion address for client node
615
     # create an onion address for client node
616
     TAHOELAFS_ONION_HOSTNAME=$(add_onion_service tahoelafs ${TAHOELAFS_PORT} ${TAHOELAFS_ONION_PORT})
616
     TAHOELAFS_ONION_HOSTNAME=$(add_onion_service tahoelafs ${TAHOELAFS_PORT} ${TAHOELAFS_ONION_PORT})
628
     create_tahoelafs_daemon "client"
628
     create_tahoelafs_daemon "client"
629
 
629
 
630
     set_completion_param "tahoelafs commit" "$TAHOELAFS_COMMIT"
630
     set_completion_param "tahoelafs commit" "$TAHOELAFS_COMMIT"
631
+    set_completion_param "tahoelafs onion domain" "$TAHOELAFS_ONION_HOSTNAME"
631
 
632
 
632
     create_tahoelafs_web
633
     create_tahoelafs_web
633
     systemctl reload tor
634
     systemctl reload tor