rename tmpl folder to include, for other contents

master
Blade of Darkness 3 years ago
parent 3c779185d4
commit f3a9e42163
  1. 0
      include/dbemail.tmpl
  2. 0
      include/email.tmpl
  3. 4
      makedb
  4. 4
      makeuser
  5. 4
      makeuser_no_ansible
  6. 2
      setenv

@ -11,6 +11,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" 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
sed -e "s/_username_/$USER/g" -e "s/_password_/$PASSWORD/g" include/dbemail.tmpl | sudo mail -s "Your database has been provisioned" $USER@thunix.net
sed -e "s/_username_/$USER/g" -e "s/_password_/$PASSWORD/g" include/dbemail.tmpl | sudo mail -s "Your database has been provisioned" $ADMIN_EMAIL

@ -45,8 +45,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" 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
sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" include/email.tmpl | sudo mail -s "Welcome to Thunix!" $2
sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" include/email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL
sub_to_list $1
# We don't need this for thunix, since ansible will do it

@ -44,8 +44,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" 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
sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" include/email.tmpl | sudo mail -s "Welcome to Thunix!" $2
sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" include/email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL
sub_to_list $1
# We don't need this for thunix, since ansible will do it

@ -8,6 +8,6 @@ export ADMIN_EMAIL="root@thunix.net"
export SIGNUP_URL="https://thunix.net/signup"
export DESCRIPTION="Thunix is a community, centered around access to a public *nix system. Thunix offers shell accounts with complete set of programming tools, and follows a continuous integration-continuous deployment of system configuration."
export LIST_NAME="thunix-join@lists.tildeverse.org"
export EMAIL_TEMPLATE="tmpl/email.tmpl"
export EMAIL_TEMPLATE="include/email.tmpl"
export TILDE_JSON="/var/www/thunix.cf/tilde.json"
export YAML_FILE="$1.yml"

Loading…
Cancel
Save