Przeglądaj źródła

upgrades of bdsmail

Bob Mottram 7 lat temu
rodzic
commit
6e4a9ba84d
1 zmienionych plików z 9 dodań i 3 usunięć
  1. 9
    3
      src/freedombone-app-bdsmail

+ 9
- 3
src/freedombone-app-bdsmail Wyświetl plik

97
     fi
97
     fi
98
     sed -i "s|username|$new_username|g" /home/$new_username/.mutt/bdsmail
98
     sed -i "s|username|$new_username|g" /home/$new_username/.mutt/bdsmail
99
     bdsmail_configure_users
99
     bdsmail_configure_users
100
-    $BDSMAIL_DIR/bin/newmail $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 "$new_user_password"
101
     chown -R $new_username:$new_username /home/$new_username/.mutt
101
     chown -R $new_username:$new_username /home/$new_username/.mutt
102
     echo '0'
102
     echo '0'
103
 }
103
 }
125
 
125
 
126
     # update to the next commit
126
     # update to the next commit
127
     set_repo_commit $BDSMAIL_DIR "bdsmail commit" "$BDSMAIL_COMMIT" $BDSMAIL_REPO
127
     set_repo_commit $BDSMAIL_DIR "bdsmail commit" "$BDSMAIL_COMMIT" $BDSMAIL_REPO
128
+    cd $BDSMAIL_DIR
129
+    make GOROOT=/home/go/go${GO_VERSION}
128
     chown -R i2psvc:i2psvc $BDSMAIL_DIR
130
     chown -R i2psvc:i2psvc $BDSMAIL_DIR
131
+    systemctl restart bdsmail
129
 }
132
 }
130
 
133
 
131
 function backup_local_bdsmail {
134
 function backup_local_bdsmail {
288
     git checkout $BDSMAIL_COMMIT -b $BDSMAIL_COMMIT
291
     git checkout $BDSMAIL_COMMIT -b $BDSMAIL_COMMIT
289
     set_completion_param "bdsmail commit" "$BDSMAIL_COMMIT"
292
     set_completion_param "bdsmail commit" "$BDSMAIL_COMMIT"
290
 
293
 
294
+    mkdir -p $BDSMAIL_DIR/Maildir/i2p
295
+    chmod -R 700 $BDSMAIL_DIR/Maildir
296
+
291
     make GOROOT=/home/go/go${GO_VERSION}
297
     make GOROOT=/home/go/go${GO_VERSION}
292
     if [ ! -f $BDSMAIL_DIR/bin/bdsconfig ]; then
298
     if [ ! -f $BDSMAIL_DIR/bin/bdsconfig ]; then
293
         echo $'Unable to make bdsmail'
299
         echo $'Unable to make bdsmail'
305
     echo "bindmail = 127.0.0.1:$I2P_SMTP_PORT" >> $BDSMAIL_DIR/config.ini
311
     echo "bindmail = 127.0.0.1:$I2P_SMTP_PORT" >> $BDSMAIL_DIR/config.ini
306
     echo 'bindweb = 127.0.0.1:8489' >> $BDSMAIL_DIR/config.ini
312
     echo 'bindweb = 127.0.0.1:8489' >> $BDSMAIL_DIR/config.ini
307
     echo 'domain = localhost' >> $BDSMAIL_DIR/config.ini
313
     echo 'domain = localhost' >> $BDSMAIL_DIR/config.ini
308
-    echo 'maildir = mail' >> $BDSMAIL_DIR/config.ini
314
+    echo 'maildir = Maildir/i2p' >> $BDSMAIL_DIR/config.ini
309
     echo 'database = localhost.sqlite' >> $BDSMAIL_DIR/config.ini
315
     echo 'database = localhost.sqlite' >> $BDSMAIL_DIR/config.ini
310
     echo 'assets = contrib/assets/web' >> $BDSMAIL_DIR/config.ini
316
     echo 'assets = contrib/assets/web' >> $BDSMAIL_DIR/config.ini
311
 
317
 
390
 
396
 
391
     bdsmail_configure_users
397
     bdsmail_configure_users
392
 
398
 
393
-    $BDSMAIL_DIR/bin/newmail $MY_USERNAME /home/$MY_USERNAME/MailDir/i2p "$user_account_password"
399
+    $BDSMAIL_DIR/bin/newmail $BDSMAIL_DIR/config.ini $MY_USERNAME /home/$MY_USERNAME/Maildir/i2p "$user_account_password"
394
     user_account_password=
400
     user_account_password=
395
 
401
 
396
     APP_INSTALLED=1
402
     APP_INSTALLED=1