From 3bff655fbc1aa7cf1ca455e3553e3e0f3acf9685 Mon Sep 17 00:00:00 2001
From: Naglfar <naglfar@tilde.team>
Date: Fri, 6 Dec 2019 15:32:09 +0000
Subject: [PATCH] ADMIN_EMAIL and REPO_LOCATION defined in setenv

---
 dbremove            | 3 ++-
 makedb              | 3 ++-
 makeuser            | 1 -
 makeuser_no_ansible | 6 ++----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dbremove b/dbremove
index 6904ca3..b940578 100755
--- a/dbremove
+++ b/dbremove
@@ -1,5 +1,6 @@
 #!/bin/bash
-ADMIN_EMAIL="root@thunix.net"
+CONFIG=./setenv
+. $CONFIG
 USER=$1
 
 sudo mysqldump -u root $USER > /tmp/$USER.sql
diff --git a/makedb b/makedb
index b36f9cc..b08ee4f 100755
--- a/makedb
+++ b/makedb
@@ -2,7 +2,8 @@
 
 USER=$1
 PASSWORD=`pwgen -1B 24`
-ADMIN_EMAIL='root@thunix.net'
+CONFIG=./setenv
+. $CONFIG
 
 sudo mysql -u root << _EOF
 CREATE DATABASE $USER;
diff --git a/makeuser b/makeuser
index 08fdedd..dcc2096 100755
--- a/makeuser
+++ b/makeuser
@@ -8,7 +8,6 @@
 PROGNAME=${0##*/}
 VERSION="0.4"
 LIST_NAME="thunix-join@lists.tildeverse.org"
-ADMIN_EMAIL="root@thunix.net"
 EMAIL_TEMPLATE="tmpl/email.tmpl"
 YAML_FILE="$1.yml"
 GEN_TDP="./gen_tdp"
diff --git a/makeuser_no_ansible b/makeuser_no_ansible
index 2d0f526..49f6d4a 100755
--- a/makeuser_no_ansible
+++ b/makeuser_no_ansible
@@ -8,13 +8,11 @@
 PROGNAME=${0##*/}
 VERSION="0.4"
 LIST_NAME="thunix-join@lists.tildeverse.org"
-ADMIN_EMAIL="root@thunix.net"
 EMAIL_TEMPLATE="tmpl/email.tmpl"
 YAML_FILE="$1.yml"
+CONFIG=./setenv
 
-# Set location to your repo for ansible here
-# It is only needed for thunix
-REPO_LOCATION="/home/ubergeek/repos/ansible/"
+. $CONFIG
 
 error_exit() {
   echo -e "${PROGNAME}: ${1:-"Unknown Error"}" >&2