浏览代码

Restore monkeysphere users

Bob Mottram 8 年前
父节点
当前提交
191b624871
共有 4 个文件被更改,包括 1034 次插入1030 次删除
  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 查看文件

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

+ 1
- 0
src/freedombone-adduser 查看文件

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

+ 1029
- 1028
src/freedombone-restore-local
文件差异内容过多而无法显示
查看文件


+ 2
- 1
src/freedombone-restore-remote 查看文件

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