xmpp password changes

This commit is contained in:
Bob Mottram 2016-11-20 11:23:56 +00:00
parent 7a3c40d921
commit 0147cadc53
7 changed files with 14 additions and 22 deletions

View File

@ -35,10 +35,6 @@ IN_DEFAULT_INSTALL=1
emacs_variables=(USB_MOUNT emacs_variables=(USB_MOUNT
MY_USERNAME) MY_USERNAME)
function change_password_emacs {
echo -n ''
}
function reconfigure_emacs { function reconfigure_emacs {
echo -n '' echo -n ''
} }

View File

@ -404,10 +404,6 @@ function install_interactive_irc {
APP_INSTALLED=1 APP_INSTALLED=1
} }
function change_password_irc {
${PROJECT_NAME}-pass -u $1 -a irc -p "$2"
}
function reconfigure_irc { function reconfigure_irc {
echo -n '' echo -n ''
} }

View File

@ -227,10 +227,6 @@ function install_interactive_syncthing {
APP_INSTALLED=1 APP_INSTALLED=1
} }
function change_password_syncthing {
echo -n ''
}
function reconfigure_syncthing { function reconfigure_syncthing {
echo -n '' echo -n ''
} }

View File

@ -106,10 +106,6 @@ function install_interactive_tox {
APP_INSTALLED=1 APP_INSTALLED=1
} }
function change_password_tox {
echo -n ''
}
function mesh_tox_qtox { function mesh_tox_qtox {
if [ ! ${rootdir}$INSTALL_DIR ]; then if [ ! ${rootdir}$INSTALL_DIR ]; then
INSTALL_DIR=${rootdir}/root/build INSTALL_DIR=${rootdir}/root/build

View File

@ -38,10 +38,6 @@ VIM_MUTT_EDITOR='vim \"+set nonumber\" \"+set insertmode\" \"+set spell\" +/^$/
vim_variables=(MY_USERNAME vim_variables=(MY_USERNAME
VIM_MUTT_EDITOR) VIM_MUTT_EDITOR)
function change_password_vim {
echo -n ''
}
function reconfigure_vim { function reconfigure_vim {
echo -n '' echo -n ''
} }

View File

@ -107,7 +107,19 @@ function install_interactive_xmpp {
} }
function change_password_xmpp { function change_password_xmpp {
echo -n '' curr_username="$1"
new_user_password="$2"
read_config_param DEFAULT_DOMAIN_NAME
${PROJECT_NAME}-pass -u $curr_username -a xmpp -p "$new_user_password"
# TODO: this is currently interactive. Really there needs to be a
# non-interactive password change option for prosodyctl
clear
echo ''
echo $'Currently Prosody requires password changes to be done interactively'
prosodyctl passwd ${curr_username}@${DEFAULT_DOMAIN_NAME}
} }
function reconfigure_xmpp { function reconfigure_xmpp {

View File

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