thunix
/
makeuser
forked from team/makeuser
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

place .tmpl files into tmpl folder

This commit is contained in:
Blade of Darkness 2019-12-04 18:06:20 +00:00
parent 4cc31809f4
commit 6942fb76d6
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makedb
View File

@ -10,6 +10,6 @@ GRANT ALL PRIVILEGES ON $USER.* TO '$USER'@'localhost' IDENTIFIED BY '$PASSWORD
FLUSH PRIVILEGES;
_EOF
sed -e "s/_username_/$USER/g" -e "s/_password_/$PASSWORD/g" dbemail.tmpl | sudo mail -s "Your database has been provisioned" $USER@thunix.net
sed -e "s/_username_/$USER/g" -e "s/_password_/$PASSWORD/g" dbemail.tmpl | sudo mail -s "Your database has been provisioned" $ADMIN_EMAIL
sed -e "s/_username_/$USER/g" -e "s/_password_/$PASSWORD/g" tmpl/dbemail.tmpl | sudo mail -s "Your database has been provisioned" $USER@thunix.net
sed -e "s/_username_/$USER/g" -e "s/_password_/$PASSWORD/g" tmpl/dbemail.tmpl | sudo mail -s "Your database has been provisioned" $ADMIN_EMAIL

6
makeuser
View File

@ -9,7 +9,7 @@ PROGNAME=${0##*/}
VERSION="0.4"
LIST_NAME="thunix-join@lists.tildeverse.org"
ADMIN_EMAIL="root@thunix.net"
EMAIL_TEMPLATE="email.tmpl"
EMAIL_TEMPLATE="tmpl/email.tmpl"
YAML_FILE="$1.yml"
GEN_TDP="./gen_tdp"
TILDE_JSON="/var/www/thunix.cf/tilde.json"
@ -55,8 +55,8 @@ case $1 in
# sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/" $EMAIL_TEMPLATE | sudo mail $1 $2 $ADMIN_EMAIL
# This is the welcome email for thunix
sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" email.tmpl | sudo mail -s "Welcome to Thunix!" $2
sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL
sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" tmpl/email.tmpl | sudo mail -s "Welcome to Thunix!" $2
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

6
makeuser_no_ansible
View File

@ -9,7 +9,7 @@ PROGNAME=${0##*/}
VERSION="0.4"
LIST_NAME="thunix-join@lists.tildeverse.org"
ADMIN_EMAIL="root@thunix.net"
EMAIL_TEMPLATE="email.tmpl"
EMAIL_TEMPLATE="tmpl/email.tmpl"
YAML_FILE="$1.yml"
# This one for team
# ZNC_USER="/home/znc/add_znc_user.sh"
@ -54,8 +54,8 @@ case $1 in
# sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/" $EMAIL_TEMPLATE | sudo mail $1 $2 $ADMIN_EMAIL
# This is the welcome email for thunix
sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" email.tmpl | sudo mail -s "Welcome to Thunix!" $2
sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL
sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" tmpl/email.tmpl | sudo mail -s "Welcome to Thunix!" $2
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

0
dbemail.tmpl → tmpl/dbemail.tmpl
View File

0
email.tmpl → tmpl/email.tmpl
View File