Browse Source

Deprecate supplying a password for bdsmail

Bob Mottram 7 years ago
parent
commit
2fa207e124
1 changed files with 2 additions and 24 deletions
  1. 2
    24
      src/freedombone-app-bdsmail

+ 2
- 24
src/freedombone-app-bdsmail View File

@@ -97,7 +97,7 @@ function add_user_bdsmail {
97 97
     fi
98 98
     sed -i "s|username|$new_username|g" /home/$new_username/.mutt/bdsmail
99 99
     bdsmail_configure_users
100
-    $BDSMAIL_DIR/bin/newmail $BDSMAIL_DIR/config.ini $new_username /home/$new_username/Maildir/i2p "$new_user_password"
100
+    $BDSMAIL_DIR/bin/newmail $BDSMAIL_DIR/config.ini $new_username /home/$new_username/Maildir/i2p
101 101
     chown -R $new_username:$new_username /home/$new_username/.mutt
102 102
     echo '0'
103 103
 }
@@ -255,27 +255,6 @@ function install_bdsmail {
255 255
         remove_bdsmail
256 256
     fi
257 257
 
258
-    # ask to the ssh login password for the admin user
259
-    # This is then used to create the maildir account
260
-    user_account_password=''
261
-    data=$(tempfile 2>/dev/null)
262
-    trap "rm -f $data" 0 1 2 5 15
263
-    dialog --title $"Password" \
264
-           --clear \
265
-           --passwordbox $"Enter your ssh login password.\n\nThis is the same as the original ssh login password shown when you first installed the system." 12 60 2> $data
266
-    ret=$?
267
-    case $ret in
268
-        0)
269
-            user_account_password=$(cat $data)
270
-            ;;
271
-    esac
272
-
273
-    if [ ${#user_account_password} -lt 2 ]; then
274
-        echo ''
275
-        echo $'A password must be provided for your user account.'
276
-        exit 3656358
277
-    fi
278
-
279 258
     if [ -d /repos/bdsmail ]; then
280 259
         mkdir $BDSMAIL_DIR
281 260
         cp -r -p /repos/bdsmail/. $BDSMAIL_DIR
@@ -420,8 +399,7 @@ function install_bdsmail {
420 399
 
421 400
     bdsmail_configure_users
422 401
 
423
-    $BDSMAIL_DIR/bin/newmail $BDSMAIL_DIR/config.ini $MY_USERNAME /home/$MY_USERNAME/Maildir/i2p "$user_account_password"
424
-    user_account_password=
402
+    $BDSMAIL_DIR/bin/newmail $BDSMAIL_DIR/config.ini $MY_USERNAME /home/$MY_USERNAME/Maildir/i2p
425 403
 
426 404
     APP_INSTALLED=1
427 405
 }