diff --git a/makeuser b/makeuser index 4576e5f..331426b 100755 --- a/makeuser +++ b/makeuser @@ -7,10 +7,8 @@ # Forked from tilde.team's make user script ( PROGNAME=${0##*/} VERSION="0.4" -EMAIL_TEMPLATE="tmpl/email.tmpl" YAML_FILE="$1.yml" GEN_TDP="./gen_tdp" -TILDE_JSON="/var/www/thunix.cf/tilde.json" CONFIG=./setenv . $CONFIG diff --git a/makeuser_no_ansible b/makeuser_no_ansible index d819fdc..4bec67f 100755 --- a/makeuser_no_ansible +++ b/makeuser_no_ansible @@ -7,7 +7,6 @@ # Forked from tilde.team's make user script ( PROGNAME=${0##*/} VERSION="0.4" -EMAIL_TEMPLATE="tmpl/email.tmpl" YAML_FILE="$1.yml" CONFIG=./setenv diff --git a/setenv b/setenv index 4057c86..c30c718 100644 --- a/setenv +++ b/setenv @@ -8,3 +8,5 @@ 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 TILDE_JSON="/var/www/thunix.cf/tilde.json"