Bob Mottram 8 лет назад
Родитель
Сommit
0147cadc53

+ 0
- 4
src/freedombone-app-emacs Просмотреть файл

@@ -35,10 +35,6 @@ IN_DEFAULT_INSTALL=1
35 35
 emacs_variables=(USB_MOUNT
36 36
                  MY_USERNAME)
37 37
 
38
-function change_password_emacs {
39
-    echo -n ''
40
-}
41
-
42 38
 function reconfigure_emacs {
43 39
     echo -n ''
44 40
 }

+ 0
- 4
src/freedombone-app-irc Просмотреть файл

@@ -404,10 +404,6 @@ function install_interactive_irc {
404 404
     APP_INSTALLED=1
405 405
 }
406 406
 
407
-function change_password_irc {
408
-    ${PROJECT_NAME}-pass -u $1 -a irc -p "$2"
409
-}
410
-
411 407
 function reconfigure_irc {
412 408
     echo -n ''
413 409
 }

+ 0
- 4
src/freedombone-app-syncthing Просмотреть файл

@@ -227,10 +227,6 @@ function install_interactive_syncthing {
227 227
     APP_INSTALLED=1
228 228
 }
229 229
 
230
-function change_password_syncthing {
231
-    echo -n ''
232
-}
233
-
234 230
 function reconfigure_syncthing {
235 231
     echo -n ''
236 232
 }

+ 0
- 4
src/freedombone-app-tox Просмотреть файл

@@ -106,10 +106,6 @@ function install_interactive_tox {
106 106
     APP_INSTALLED=1
107 107
 }
108 108
 
109
-function change_password_tox {
110
-    echo -n ''
111
-}
112
-
113 109
 function mesh_tox_qtox {
114 110
     if [ ! ${rootdir}$INSTALL_DIR ]; then
115 111
         INSTALL_DIR=${rootdir}/root/build

+ 0
- 4
src/freedombone-app-vim Просмотреть файл

@@ -38,10 +38,6 @@ VIM_MUTT_EDITOR='vim \"+set nonumber\" \"+set insertmode\" \"+set spell\" +/^$/
38 38
 vim_variables=(MY_USERNAME
39 39
                VIM_MUTT_EDITOR)
40 40
 
41
-function change_password_vim {
42
-    echo -n ''
43
-}
44
-
45 41
 function reconfigure_vim {
46 42
     echo -n ''
47 43
 }

+ 13
- 1
src/freedombone-app-xmpp Просмотреть файл

@@ -107,7 +107,19 @@ function install_interactive_xmpp {
107 107
 }
108 108
 
109 109
 function change_password_xmpp {
110
-    echo -n ''
110
+    curr_username="$1"
111
+    new_user_password="$2"
112
+
113
+    read_config_param DEFAULT_DOMAIN_NAME
114
+
115
+    ${PROJECT_NAME}-pass -u $curr_username -a xmpp -p "$new_user_password"
116
+
117
+    # TODO: this is currently interactive. Really there needs to be a
118
+    # non-interactive password change option for prosodyctl
119
+    clear
120
+    echo ''
121
+    echo $'Currently Prosody requires password changes to be done interactively'
122
+    prosodyctl passwd ${curr_username}@${DEFAULT_DOMAIN_NAME}
111 123
 }
112 124
 
113 125
 function reconfigure_xmpp {

+ 1
- 1
src/freedombone-tests Просмотреть файл

@@ -61,7 +61,7 @@ function test_app_functions {
61 61
     FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
62 62
 
63 63
     # check that these functions exist
64
-    interface_functions=( install remove backup_local backup_remote restore_local restore_remote upgrade reconfigure change_password )
64
+    interface_functions=( install remove backup_local backup_remote restore_local restore_remote upgrade reconfigure )
65 65
 
66 66
     # for all the app scripts
67 67
     for filename in $FILES