瀏覽代碼

For now disable monkeysphere link to ssh-agent

Bob Mottram 8 年之前
父節點
當前提交
d9608c0ba6
共有 1 個檔案被更改,包括 6 行新增2 行删除
  1. 6
    2
      src/freedombone-adduser

+ 6
- 2
src/freedombone-adduser 查看文件

152
 fi
152
 fi
153
 
153
 
154
 # add a monkeysphere subkey
154
 # add a monkeysphere subkey
155
-su -c "monkeysphere gen-subkey $MY_GPG_PUBLIC_KEY_ID" - $MY_USERNAME
155
+#echo $'Adding monkeysphere subkey'
156
+#su -c "monkeysphere gen-subkey" - $MY_USERNAME
157
+#echo $'Adding monkeysphere subkey to ssh-agent'
158
+#su -c "monkeysphere s" - $MY_USERNAME
156
 # add authorized GPG email address
159
 # add authorized GPG email address
157
 mkdir /home/$MY_USERNAME/.monkeysphere
160
 mkdir /home/$MY_USERNAME/.monkeysphere
158
 chmod 755 /home/$MY_USERNAME/.monkeysphere
161
 chmod 755 /home/$MY_USERNAME/.monkeysphere
159
 echo "$MY_USERNAME <$MY_USERNAME@$HOSTNAME>" > /home/$MY_USERNAME/.monkeysphere/authorized_user_ids
162
 echo "$MY_USERNAME <$MY_USERNAME@$HOSTNAME>" > /home/$MY_USERNAME/.monkeysphere/authorized_user_ids
160
 chmod 644 /home/$MY_USERNAME/.monkeysphere/authorized_user_ids
163
 chmod 644 /home/$MY_USERNAME/.monkeysphere/authorized_user_ids
161
 chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.monkeysphere
164
 chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.monkeysphere
162
-#monkeysphere-authentication update-users
165
+echo $'Updating monkeysphere users'
166
+monkeysphere-authentication update-users
163
 
167
 
164
 if [ -f /home/$MY_USERNAME/.muttrc ]; then
168
 if [ -f /home/$MY_USERNAME/.muttrc ]; then
165
     # encrypt outgoing mail to the "sent" folder
169
     # encrypt outgoing mail to the "sent" folder