From 2f22ceacefb351b9582535e92f153b7ebb0fd2fb Mon Sep 17 00:00:00 2001 From: Naglfar Date: Wed, 4 Dec 2019 18:34:53 +0000 Subject: [PATCH] create-znc_account.sh no longer works since znc-1.7.1 --- makeuser | 11 ----------- makeuser_no_ansible | 10 ---------- 2 files changed, 21 deletions(-) diff --git a/makeuser b/makeuser index 19627fd..1171d92 100755 --- a/makeuser +++ b/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 diff --git a/makeuser_no_ansible b/makeuser_no_ansible index 5a75b79..2d0f526 100755 --- a/makeuser_no_ansible +++ b/makeuser_no_ansible @@ -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