Browse Source

Restore monkeysphere users

Bob Mottram 9 years ago
parent
commit
191b624871
4 changed files with 1034 additions and 1030 deletions
  1. 2
    1
      src/freedombone
  2. 1
    0
      src/freedombone-adduser
  3. 1029
    1028
      src/freedombone-restore-local
  4. 2
    1
      src/freedombone-restore-remote

+ 2
- 1
src/freedombone View File

5375
     echo "$MY_USERNAME <${MY_EMAIL_ADDRESS}>" > /home/$MY_USERNAME/.monkeysphere/authorized_user_ids
5375
     echo "$MY_USERNAME <${MY_EMAIL_ADDRESS}>" > /home/$MY_USERNAME/.monkeysphere/authorized_user_ids
5376
     chmod 644 /home/$MY_USERNAME/.monkeysphere/authorized_user_ids
5376
     chmod 644 /home/$MY_USERNAME/.monkeysphere/authorized_user_ids
5377
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.monkeysphere
5377
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.monkeysphere
5378
-
5378
+    monkeysphere-authentication update-users
5379
+	
5379
     echo 'install_monkeysphere' >> $COMPLETION_FILE
5380
     echo 'install_monkeysphere' >> $COMPLETION_FILE
5380
 }
5381
 }
5381
 
5382
 

+ 1
- 0
src/freedombone-adduser View File

146
 echo "$MY_USERNAME <${$MY_USERNAME@$HOSTNAME}>" > /home/$MY_USERNAME/.monkeysphere/authorized_user_ids
146
 echo "$MY_USERNAME <${$MY_USERNAME@$HOSTNAME}>" > /home/$MY_USERNAME/.monkeysphere/authorized_user_ids
147
 chmod 644 /home/$MY_USERNAME/.monkeysphere/authorized_user_ids
147
 chmod 644 /home/$MY_USERNAME/.monkeysphere/authorized_user_ids
148
 chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.monkeysphere
148
 chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.monkeysphere
149
+monkeysphere-authentication update-users
149
 
150
 
150
 if [ -f /home/$MY_USERNAME/.muttrc ]; then
151
 if [ -f /home/$MY_USERNAME/.muttrc ]; then
151
 	# encrypt outgoing mail to the "sent" folder
152
 	# encrypt outgoing mail to the "sent" folder

+ 1029
- 1028
src/freedombone-restore-local
File diff suppressed because it is too large
View File


+ 2
- 1
src/freedombone-restore-remote View File

501
 				if [ ! -d /home/$USERNAME ]; then
501
 				if [ ! -d /home/$USERNAME ]; then
502
 					${PROJECT_NAME}-adduser $USERNAME
502
 					${PROJECT_NAME}-adduser $USERNAME
503
 				fi
503
 				fi
504
-				echo $"Restoring monkeysphere files for $USERNAME"
504
+				echo $"Restoring monkeysphere ids for $USERNAME"
505
 				restore_directory_from_friend /root/tempmonkeysphere monkeysphere/$USERNAME
505
 				restore_directory_from_friend /root/tempmonkeysphere monkeysphere/$USERNAME
506
 				cp -r /root/tempmonkeysphere/home/$USERNAME/.monkeysphere /home/$USERNAME/
506
 				cp -r /root/tempmonkeysphere/home/$USERNAME/.monkeysphere /home/$USERNAME/
507
 				if [ ! "$?" = "0" ]; then
507
 				if [ ! "$?" = "0" ]; then
511
 				rm -rf /root/tempmonkeysphere
511
 				rm -rf /root/tempmonkeysphere
512
 			fi
512
 			fi
513
 		fi
513
 		fi
514
+		monkeysphere-authentication update-users
514
 	done
515
 	done
515
 }
516
 }
516
 
517