forked from team/makeuser
create-znc_account.sh no longer works since znc-1.7.1
This commit is contained in:
parent
6942fb76d6
commit
2f22ceacef
11
makeuser
11
makeuser
|
@ -14,12 +14,6 @@ YAML_FILE="$1.yml"
|
|||
GEN_TDP="./gen_tdp"
|
||||
TILDE_JSON="/var/www/thunix.cf/tilde.json"
|
||||
|
||||
# This one for team
|
||||
# ZNC_USER="/home/znc/add_znc_user.sh"
|
||||
|
||||
# This one for Thunix
|
||||
ZNC_USER="/var/lib/znc/create-znc_account.sh"
|
||||
|
||||
. ./setenv
|
||||
|
||||
error_exit() {
|
||||
|
@ -59,11 +53,6 @@ case $1 in
|
|||
sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" tmpl/email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL
|
||||
sub_to_list $1
|
||||
|
||||
# This line is for team
|
||||
# sudo -u znc $ZNC_USER $1
|
||||
# This one is for Thunix
|
||||
sudo $ZNC_USER $1 $pwcrypt
|
||||
|
||||
# We don't need this for thunix, since ansible will do it
|
||||
# echo "$3" | tee /home/$1/.ssh/authorized_keys
|
||||
|
||||
|
|
|
@ -11,11 +11,6 @@ LIST_NAME="thunix-join@lists.tildeverse.org"
|
|||
ADMIN_EMAIL="root@thunix.net"
|
||||
EMAIL_TEMPLATE="tmpl/email.tmpl"
|
||||
YAML_FILE="$1.yml"
|
||||
# This one for team
|
||||
# ZNC_USER="/home/znc/add_znc_user.sh"
|
||||
|
||||
# This one for Thunix
|
||||
ZNC_USER="/var/lib/znc/create-znc_account.sh"
|
||||
|
||||
# Set location to your repo for ansible here
|
||||
# It is only needed for thunix
|
||||
|
@ -58,11 +53,6 @@ case $1 in
|
|||
sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" tmpl/email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL
|
||||
sub_to_list $1
|
||||
|
||||
# This line is for team
|
||||
# sudo -u znc $ZNC_USER $1
|
||||
# This one is for Thunix
|
||||
sudo $ZNC_USER $1 $pwcrypt
|
||||
|
||||
# We don't need this for thunix, since ansible will do it
|
||||
# echo "$3" | tee /home/$1/.ssh/authorized_keys
|
||||
|
||||
|
|
Loading…
Reference in New Issue